zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 09:57:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'alpha' into staging

Browse source
This commit is contained in:
Priit Tark 2015-06-19 19:44:33 +03:00
commit a367270036
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
config.ru
View file

@ -3,10 +3,11 @@
require ::File.expand_path('../config/environment', __FILE__) require ::File.expand_path('../config/environment', __FILE__)
run Rails.application run Rails.application
if defined?(PhusionPassenger) # turn automatic que temp off
PhusionPassenger.on_event(:starting_worker_process) do |forked| # if defined?(PhusionPassenger)
if forked # PhusionPassenger.on_event(:starting_worker_process) do |forked|
Que.mode = :async # if forked
end # Que.mode = :async
end # end
end # end
# end

2
config/locales/en.yml
View file

@ -830,4 +830,4 @@ en:
unset_force_delete: 'Unset force delete' unset_force_delete: 'Unset force delete'
domain_expiring: 'Domain expiring' domain_expiring: 'Domain expiring'
domain_validation_rules: 'Domain validation rules' 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>.'