Merge branch 'master' of github.com:domify/registry

Conflicts:
	config/locales/en.yml

config/initializers/initial_settings.rb

@@ -10,6 +10,7 @@ if con.present? && con.table_exists?('settings')
   Setting.save_default(:admin_contacts_max_count, 10)
   Setting.save_default(:tech_contacts_min_count, 1)
   Setting.save_default(:tech_contacts_max_count, 10)
+  Setting.save_default(:expire_pending_confirmation, 48)
 
   Setting.save_default(:ds_algorithm, 2)
   Setting.save_default(:ds_data_allowed, true)

config/locales/en.yml

@@ -870,3 +870,4 @@ en:
   no_transfers_found: 'No transfers found'
   parameter_value_range_error: 'Parameter value range error: %{key}'
   payment_received: 'Payment received'
+  domain_registrant_updated: 'Domeeni %{name} registreerija vahetus teostatud / Registrant change of %{name} has been finished.'

config/schedule.rb

@@ -16,28 +16,38 @@ every 10.minutes do
   runner 'ZonefileSetting.generate_zonefiles'
 end
 
-every 6.months, at: '12pm' do
+every 6.months, at: '12:01am' do
   runner 'Contact.destroy_orphans'
 end
 
-every :day, at: '12:10pm' do
+every :day, at: '12:10am' do
   runner 'Invoice.cancel_overdue_invoices'
 end
 
-every :day, at: '12:15pm' do
+every :day, at: '12:15am' do
   runner 'Domain.expire_domains'
 end
 
+every :day, at: '12:20am' do
+  runner 'Domain.clean_expired_pendings'
+end
+
 every 3.hours do
   runner 'Certificate.update_crl'
 end
 
-every :hour do
-  runner 'Domain.start_expire_period'
-  runner 'Domain.start_redemption_grace_period'
-  runner 'Domain.start_delete_period'
-end
-
 every 42.minutes do
   runner 'Domain.destroy_delete_candidates'
 end
+
+every 45.minutes do
+  runner 'Domain.start_expire_period'
+end
+
+every 50.minutes do
+  runner 'Domain.start_delete_period'
+end
+
+every 52.minutes do
+  runner 'Domain.start_redemption_grace_period'
+end