From b4496da4bebfeacab181cf42fe28f0367ae3ed02 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Fri, 19 Jun 2015 19:41:27 +0300
Subject: [PATCH 1/2] Update th6 description #2720

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f6d929e06..b95085cc7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -830,4 +830,4 @@ en:
   unset_force_delete: 'Unset force delete'
   domain_expiring: 'Domain expiring'
   domain_validation_rules: 'Domain validation rules'
-  bank_statement_desc: 'Import file row will match only when matching following attributes: <b>invoice nr, description, sum and client ref number</b>.'
+  bank_statement_desc: 'Import file row will match only when matching following attributes: <b><br>ref number<br>payment amount<br>invoice number (the very first number in comment field)</b>.'

From 9562d2f30d23852978cf72e3abc9611dbc92870d Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Fri, 19 Jun 2015 19:42:10 +0300
Subject: [PATCH 2/2] Turn automatic que temp off #2724

---
 config.ru | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/config.ru b/config.ru
index 4112838a0..4fa72a37f 100644
--- a/config.ru
+++ b/config.ru
@@ -3,10 +3,11 @@
 require ::File.expand_path('../config/environment',  __FILE__)
 run Rails.application
 
-if defined?(PhusionPassenger)
-  PhusionPassenger.on_event(:starting_worker_process) do |forked|
-    if forked
-      Que.mode = :async
-    end
-  end
-end
+# turn automatic que temp off
+# if defined?(PhusionPassenger)
+  # PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    # if forked
+      # Que.mode = :async
+    # end
+  # end
+# end