From 42b8b990eb6618b85b6a02dd79b40d88d05f4063 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Thu, 16 Feb 2017 15:05:27 +0200
Subject: [PATCH 01/36] Remove unneeded specs

---
 spec/models/admin_user_spec.rb | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/spec/models/admin_user_spec.rb b/spec/models/admin_user_spec.rb
index 0d3c7e083..84a653614 100644
--- a/spec/models/admin_user_spec.rb
+++ b/spec/models/admin_user_spec.rb
@@ -16,16 +16,6 @@ RSpec.describe AdminUser do
       @admin_user = Fabricate(:admin_user)
     end
 
-    it 'should have one version' do
-      with_versioning do
-        @admin_user.versions.should == []
-        @admin_user.updated_at = Time.zone.now
-        @admin_user.save
-        @admin_user.errors.full_messages.should match_array([])
-        @admin_user.versions.size.should == 1
-      end
-    end
-
     it 'should require password confirmation when changing password' do
       @admin_user.valid?.should == true
       @admin_user.password = 'not confirmed'
@@ -39,10 +29,4 @@ RSpec.describe AdminUser do
       expect(described_class.min_password_length).to eq(8)
     end
   end
-
-  describe '#min_password_length' do
-    it 'returns minimum password length' do
-      expect(described_class.min_password_length).to eq(8)
-    end
-  end
 end

From 27a7087f5124e9fcceaffaf9a95b47e36a135390 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Sun, 12 Mar 2017 17:13:56 +0200
Subject: [PATCH 02/36] Update domain_delete mailer html content

#268
---
 .../forced/death.html.erb                     | 21 +++++++++++--------
 .../forced/removed_company.html.erb           | 21 +++++++++++--------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/views/mailers/domain_delete_mailer/forced/death.html.erb b/app/views/mailers/domain_delete_mailer/forced/death.html.erb
index 698a4067d..0213e07d9 100644
--- a/app/views/mailers/domain_delete_mailer/forced/death.html.erb
+++ b/app/views/mailers/domain_delete_mailer/forced/death.html.erb
@@ -1,4 +1,4 @@
-<p>Lugupeetud domeeni <%= @domain.name %> registreerija/halduskontakt</p>
+<p><strong>Lugupeetud domeeni <%= @domain.name %> registreerija/halduskontakt</strong></p>
 
 <p>Eesti Interneti Sihtasutusele (EIS) on saanud teatavaks, et füüsiline isik isikukoodiga <%= @registrant.id_code %> on surnud ja sellest on möödunud vähemalt 6 kuud.</p>
 
@@ -11,10 +11,11 @@
 <p>Lisaküsimuste korral võtke palun ühendust oma registripidajaga:</p>
 <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
 
-Lugupidamisega
-Eesti Interneti Sihtasutus
+<p><strong>Lugupidamisega<br>
+Eesti Interneti Sihtasutus</strong>
+</p>
 <hr>
-<p>Dear registrant/administrative contact of .ee domain,</p>
+<p><strong>Dear registrant/administrative contact of .ee domain,</strong></p>
 
 <p>Estonian Internet Foundation (EIF) has learned that the natural person <%= @registrant.name %> with identification code <%= @registrant.id_code %> has been deceased more than 6 months.</p>
 
@@ -27,10 +28,11 @@ Eesti Interneti Sihtasutus
 <p>Should you have additional questions, please contact your registrar:</p>
 <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
 
-Best Regards,
-Estonian Internet Foundation
+<p><strong>Best Regards,<br>
+Estonian Internet Foundation</strong>
+</p>
 <hr>
-<p>Уважаемый регистрант/административный контакт домена .ee</p>
+<p><strong>Уважаемый регистрант/административный контакт домена .ee</strong></p>
 
 <p>Целевому учреждению Eesti Internet (EIS) стало известно, что физическое лицо с личным кодом <%= @registrant.id_code %> умерло, и с момента смерти прошло не менее 6 месяцев.</p>
 
@@ -43,5 +45,6 @@ Estonian Internet Foundation
 <p>В случае возникновения дополнительных вопросов свяжитесь, пожалуйста, со своим регистратором:</p>
 <%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %>
 
-С уважением,
-Eesti Interneti Sihtasutus
+<p><strong>С уважением,<br>
+Eesti Interneti Sihtasutus</strong>
+</p>
diff --git a/app/views/mailers/domain_delete_mailer/forced/removed_company.html.erb b/app/views/mailers/domain_delete_mailer/forced/removed_company.html.erb
index b3cdff536..785366fee 100644
--- a/app/views/mailers/domain_delete_mailer/forced/removed_company.html.erb
+++ b/app/views/mailers/domain_delete_mailer/forced/removed_company.html.erb
@@ -1,4 +1,4 @@
-<p>Lugupeetud domeeni <%= @domain.name %> registreerija/halduskontakt</p>
+<p><strong>Lugupeetud domeeni <%= @domain.name %> registreerija/halduskontakt</strong></p>
 
 <p>Eesti Interneti Sihtasutusele (EIS) on saanud teatavaks, et juriidiline isik registrikoodiga <%= @registrant.reg_no %> on äriregistrist kustutatud.</p>
 
@@ -11,10 +11,11 @@
 <p>Lisaküsimuste korral võtke palun ühendust oma registripidajaga:</p>
 <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
 
-Lugupidamisega
-Eesti Interneti Sihtasutus
+<p><strong>Lugupidamisega<br>
+Eesti Interneti Sihtasutus</strong>
+</p>
 <hr>
-<p>Dear registrant/administrative contact of .ee domain,</p>
+<p><strong>Dear registrant/administrative contact of .ee domain,</strong></p>
 
 <p>Estonian Internet Foundation (EIS) has learned that the legal person with registry code <%= @registrant.reg_no %> has been deleted from the Business Registry.</p>
 
@@ -27,10 +28,11 @@ Eesti Interneti Sihtasutus
 <p>Should you have additional questions, please contact your registrar:</p>
 <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
 
-Best Regards,
-Estonian Internet Foundation
+<p><strong>Best Regards,<br>
+Estonian Internet Foundation</strong>
+</p>
 <hr>
-<p>Уважаемый регистрант/административный контакт домена .ee</p>
+<p><strong>Уважаемый регистрант/административный контакт домена .ee</strong></p>
 
 <p>Целевому учреждению Eesti Internet (EIS) стало известно, что юридическое лицо с регистрационным кодом <%= @registrant.reg_no %> удалено из коммерческого реестра.</p>
 
@@ -43,5 +45,6 @@ Estonian Internet Foundation
 <p>В случае возникновения дополнительных вопросов свяжитесь, пожалуйста, со своим регистратором:</p>
 <%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %>
 
-С уважением,
-Eesti Interneti Sihtasutus
+<p><strong>С уважением,<br>
+Eesti Interneti Sihtasutus</strong>
+</p>

From 91bc1ab23d8c0c7fed3302a5a0ed12accd6bc05a Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Mon, 3 Apr 2017 18:16:56 +0300
Subject: [PATCH 03/36] Remove jQuery validation from registrar area

Since it doesn't support "accept" attribute with comma-separated
extensions

#432
---
 app/assets/javascripts/registrar/application.coffee | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/javascripts/registrar/application.coffee b/app/assets/javascripts/registrar/application.coffee
index a1a2084fe..f1b92f0f1 100644
--- a/app/assets/javascripts/registrar/application.coffee
+++ b/app/assets/javascripts/registrar/application.coffee
@@ -1,8 +1,4 @@
 $(document).on 'page:change', ->
-  # client side validate all forms
-  $('form').each ->
-    $(this).validate()
-
   $('.js-contact-form').on 'restoreDefault', (e) ->
     form = $(e.target)
     form.find('.js-ident-tip').hide()

From e72c00850b58ff0a4a4a02e62b343cbeb0681511 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 4 Apr 2017 14:57:00 +0300
Subject: [PATCH 04/36] Supplement registrar specs

---
 spec/requests/admin/registrars/create_spec.rb | 10 ++++++++++
 spec/requests/admin/registrars/update_spec.rb | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/spec/requests/admin/registrars/create_spec.rb b/spec/requests/admin/registrars/create_spec.rb
index e144b19f8..e66fb0765 100644
--- a/spec/requests/admin/registrars/create_spec.rb
+++ b/spec/requests/admin/registrars/create_spec.rb
@@ -17,6 +17,16 @@ RSpec.describe 'admin registrar create' do
     expect(registrar.website).to eq('test')
   end
 
+  it 'saves email' do
+    post admin_registrars_path, { registrar: attributes_for(:registrar, email: 'test@test.com') }
+    expect(registrar.email).to eq('test@test.com')
+  end
+
+  it 'saves billing email' do
+    post admin_registrars_path, { registrar: attributes_for(:registrar, billing_email: 'test@test.com') }
+    expect(registrar.billing_email).to eq('test@test.com')
+  end
+
   it 'redirects to :show' do
     post admin_registrars_path, { registrar: attributes_for(:registrar) }
     expect(response).to redirect_to admin_registrar_path(registrar)
diff --git a/spec/requests/admin/registrars/update_spec.rb b/spec/requests/admin/registrars/update_spec.rb
index fc99bccd0..7bffb99d0 100644
--- a/spec/requests/admin/registrars/update_spec.rb
+++ b/spec/requests/admin/registrars/update_spec.rb
@@ -14,6 +14,24 @@ RSpec.describe 'admin registrar update' do
     expect(registrar.website).to eq('new-website')
   end
 
+  it 'updates email' do
+    registrar = create(:registrar, email: 'test@test.com')
+
+    patch admin_registrar_path(registrar), registrar: attributes_for(:registrar, email: 'new-test@test.com')
+    registrar.reload
+
+    expect(registrar.email).to eq('new-test@test.com')
+  end
+
+  it 'updates billing email' do
+    registrar = create(:registrar, billing_email: 'test@test.com')
+
+    patch admin_registrar_path(registrar), registrar: attributes_for(:registrar, billing_email: 'new-test@test.com')
+    registrar.reload
+
+    expect(registrar.billing_email).to eq('new-test@test.com')
+  end
+
   it 'redirects to :show' do
     registrar = create(:registrar)
 

From 2c67ed967332353a0848481a7ab33380b5fe80c4 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 4 Apr 2017 14:58:20 +0300
Subject: [PATCH 05/36] Use native HTML email validation instead of "jquery
 validate"

---
 .../javascripts/shared/jquery.validate.bootstrap.coffee     | 4 ----
 app/views/admin/admin_users/_form.haml                      | 2 +-
 app/views/admin/mail_templates/_form.haml                   | 6 +++---
 app/views/admin/registrars/_form.haml                       | 4 ++--
 app/views/registrar/contacts/form/_general.haml             | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/shared/jquery.validate.bootstrap.coffee b/app/assets/javascripts/shared/jquery.validate.bootstrap.coffee
index 698eb9706..41b63748c 100644
--- a/app/assets/javascripts/shared/jquery.validate.bootstrap.coffee
+++ b/app/assets/javascripts/shared/jquery.validate.bootstrap.coffee
@@ -17,7 +17,3 @@ $.validator.setDefaults
     else
       error.insertAfter element
     return
-
-jQuery.validator.addMethod 'lax_email', ((value, element) ->
-  @optional(element) or (value.match(new RegExp("@", "g")) || []).length == 1
-), 'Please enter a valid email address.'
diff --git a/app/views/admin/admin_users/_form.haml b/app/views/admin/admin_users/_form.haml
index 0904ea99f..512cddde8 100644
--- a/app/views/admin/admin_users/_form.haml
+++ b/app/views/admin/admin_users/_form.haml
@@ -38,7 +38,7 @@
         .col-md-4.control-label
           = f.label :email
         .col-md-8
-          = f.text_field(:email, class: 'form-control', lax_email: true)
+          = f.email_field :email, class: 'form-control'
       .form-group
         .col-md-4.control-label
           = f.label :country_code, t(:country)
diff --git a/app/views/admin/mail_templates/_form.haml b/app/views/admin/mail_templates/_form.haml
index 6e9d828c5..739cce665 100644
--- a/app/views/admin/mail_templates/_form.haml
+++ b/app/views/admin/mail_templates/_form.haml
@@ -24,17 +24,17 @@
             .col-md-4.control-label
               = f.label :from
             .col-md-7
-              = f.text_field(:from, class: 'form-control', lax_email: true)
+              = f.email_field :from, class: 'form-control'
           .form-group
             .col-md-4.control-label
               = f.label :cc
             .col-md-7
-              = f.text_field(:cc, class: 'form-control', lax_email: true)
+              = f.email_field :cc, class: 'form-control'
           .form-group
             .col-md-4.control-label
               = f.label :bcc
             .col-md-7
-              = f.text_field(:bcc, class: 'form-control', lax_email: true)
+              = f.email_field :bcc, class: 'form-control'
           .form-group
             .col-md-12
               = f.label :body, t(:html_body)
diff --git a/app/views/admin/registrars/_form.haml b/app/views/admin/registrars/_form.haml
index d62a375f8..abf440921 100644
--- a/app/views/admin/registrars/_form.haml
+++ b/app/views/admin/registrars/_form.haml
@@ -36,12 +36,12 @@
             .col-md-4.control-label
               = f.label :email
             .col-md-7
-              = f.text_field(:email, class: 'form-control', lax_email: true)
+              = f.email_field :email, class: 'form-control'
           .form-group
             .col-md-4.control-label
               = f.label :billing_email
             .col-md-7
-              = f.text_field(:billing_email, class: 'form-control', lax_email: true)
+              = f.email_field :billing_email, class: 'form-control'
 
   .row
     .col-md-8
diff --git a/app/views/registrar/contacts/form/_general.haml b/app/views/registrar/contacts/form/_general.haml
index a6ecbb500..b8ff90965 100644
--- a/app/views/registrar/contacts/form/_general.haml
+++ b/app/views/registrar/contacts/form/_general.haml
@@ -61,7 +61,7 @@
       .col-md-3.control-label
         = f.label :email, t(:email) + '*'
       .col-md-7
-        = f.text_field :email, class: 'form-control', required: true, lax_email: true
+        = f.email_field :email, class: 'form-control', required: true
 
     .form-group
       .col-md-3.control-label

From d62a4e8530f3d3039a5e5ee3898d7d96782eb928 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 4 Apr 2017 15:15:33 +0300
Subject: [PATCH 06/36] Remove "jquery validate" from registrar area

#432
---
 app/assets/javascripts/registrar-manifest.coffee | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/assets/javascripts/registrar-manifest.coffee b/app/assets/javascripts/registrar-manifest.coffee
index 29b950fb4..86b7b4060 100644
--- a/app/assets/javascripts/registrar-manifest.coffee
+++ b/app/assets/javascripts/registrar-manifest.coffee
@@ -1,12 +1,9 @@
 #= require jquery
 #= require jquery_ujs
-#= require jquery.validate
-#= require jquery.validate.additional-methods
 #= require turbolinks
 #= require bootstrap-sprockets
 #= require typeahead.bundle.min
 #= require jquery.nested_attributes
-#= require shared/jquery.validate.bootstrap
 #= require jquery-ui/datepicker
 #= require select2
 

From 04343b44020dc221ec12de2273c3668a0412f8b9 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Tue, 4 Apr 2017 14:57:21 +0300
Subject: [PATCH 07/36] ruby to 2.2.7

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index b1b25a5ff..5bc1cc43d 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.2.2
+2.2.7

From bd883a1347c116a3fc2edcb28ab7dd7295b809bb Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Tue, 4 Apr 2017 15:01:31 +0300
Subject: [PATCH 08/36] update simpleidn

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 11e5d92a0..110043140 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,7 @@ gem 'grape',    '0.12.0'
 gem 'jbuilder', '2.2.16'  # json api
 
 # registry specfic
-gem 'simpleidn', '0.0.5' # For punycode
+gem 'simpleidn', '0.0.7' # For punycode
 gem 'isikukood' # for EE-id validation
 gem 'money-rails', '1.4.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b3810caf..0a5cfa15d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -496,7 +496,7 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    simpleidn (0.0.5)
+    simpleidn (0.0.7)
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -643,7 +643,7 @@ DEPENDENCIES
   select2-rails (= 3.5.9.3)
   selectize-rails (= 0.12.1)
   simplecov (= 0.10.0)
-  simpleidn (= 0.0.5)
+  simpleidn (= 0.0.7)
   spring (= 1.3.6)
   spring-commands-rspec (= 1.0.4)
   therubyracer (= 0.12.2)
@@ -656,4 +656,4 @@ DEPENDENCIES
   whenever (= 0.9.4)
 
 BUNDLED WITH
-   1.13.1
+   1.13.6

From 9a1adde18bf258fda87c904cda075b5ed665cf93 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Tue, 4 Apr 2017 15:13:09 +0300
Subject: [PATCH 09/36] Fix merge conflict

---
 Gemfile.lock | 167 +++++++++++++++++++++++++++------------------------
 1 file changed, 88 insertions(+), 79 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0a5cfa15d..ce51ad948 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,29 +98,29 @@ GEM
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
-    addressable (2.3.8)
-    airbrake (5.6.0)
-      airbrake-ruby (~> 1.6)
-    airbrake-ruby (1.6.0)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    airbrake (6.0.0)
+      airbrake-ruby (~> 2.0)
+    airbrake-ruby (2.0.0)
     akami (1.3.1)
       gyoku (>= 0.4.0)
       nokogiri
-    arel (6.0.3)
-    ast (2.1.0)
+    arel (6.0.4)
+    ast (2.3.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
-    autodoc (0.5.1)
+    autodoc (0.6.0)
       actionpack
       activesupport (>= 3.0.0)
       rspec
-    autoprefixer-rails (6.0.2)
+    autoprefixer-rails (6.7.7.1)
       execjs
-      json
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bcrypt (3.1.10)
+    bcrypt (3.1.11)
     bootstrap-datepicker-rails (1.3.1.1)
       railties (>= 3.0)
     bootstrap-sass (3.3.5.1)
@@ -136,7 +136,7 @@ GEM
       ruby_parser (~> 3.7.0)
       sass (~> 3.0)
       terminal-table (~> 1.4)
-    builder (3.2.2)
+    builder (3.2.3)
     bullet (4.14.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.9.0)
@@ -158,22 +158,22 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.12.2)
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.5)
     countries (0.11.4)
       currencies (~> 0.4.2)
       i18n_data (~> 0.7.0)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     currencies (0.4.2)
-    daemons (1.2.3)
+    daemons (1.2.4)
     daemons-rails (1.2.1)
       daemons
       multi_json (~> 1.0)
-    database_cleaner (1.4.1)
+    database_cleaner (1.5.3)
     deep_cloneable (2.1.1)
       activerecord (>= 3.1.0, < 5.0.0)
     descendants_tracker (0.0.4)
@@ -193,19 +193,19 @@ GEM
       nokogiri (>= 1.4.0)
       savon (>= 2.4.0)
     docile (1.1.5)
-    domain_name (0.5.25)
+    domain_name (0.5.20170223)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
     erubis (2.7.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     fabrication (2.13.2)
-    factory_girl (4.7.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
     fastercsv (1.5.5)
-    ffi (1.9.10)
+    ffi (1.9.18)
     figaro (1.1.1)
       thor (~> 0.14)
     flay (2.4.0)
@@ -215,7 +215,7 @@ GEM
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.4)
     formatador (0.2.5)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     grape (0.12.0)
       activesupport
@@ -257,8 +257,8 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hashdiff (0.3.1)
-    hashie (3.4.2)
+    hashdiff (0.3.2)
+    hashie (3.5.5)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
     highline (1.6.21)
@@ -269,14 +269,15 @@ GEM
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
     html5_validators (1.2.2)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httpclient (2.6.0.1)
-    httpi (2.4.1)
+    httpclient (2.8.3)
+    httpi (2.4.2)
       rack
+      socksify
     i18n (0.7.0)
     i18n_data (0.7.0)
-    ice_nine (0.11.1)
+    ice_nine (0.11.2)
     isikukood (0.1.2)
     iso8601 (0.8.6)
     jbuilder (2.2.16)
@@ -291,33 +292,36 @@ GEM
     jquery-validation-rails (1.13.1)
       railties (>= 3.2, < 5.0)
       thor (~> 0.14)
-    json (1.8.3)
+    json (1.8.6)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.10.0)
+    kgio (2.11.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.11)
-    libxml-ruby (2.9.0)
+    libv8 (3.16.14.19)
+    libxml-ruby (3.0.0)
     liquid (3.0.6)
-    listen (3.0.3)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    lumberjack (1.0.11)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
-    mime-types (2.99.1)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mina (0.3.1)
       open4 (~> 1.3.4)
       rake
     mini_portile2 (2.1.0)
-    minitest (5.8.4)
+    minitest (5.10.1)
     monetize (1.1.0)
       money (~> 6.5.0)
     money (6.5.1)
@@ -327,21 +331,21 @@ GEM
       monetize (~> 1.1.0)
       money (~> 6.5.0)
       railties (>= 3.0)
-    multi_json (1.11.2)
-    multi_xml (0.5.5)
-    nenv (0.2.0)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    nenv (0.3.0)
     netrc (0.11.0)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
     nori (2.6.0)
-    notiffany (0.0.7)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
     nprogress-rails (0.1.6.7)
     open4 (1.3.4)
     orm_adapter (0.5.0)
-    parser (2.2.2.6)
+    parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     pdfkit (0.6.2)
     pg (0.18.2)
@@ -354,20 +358,22 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyamorous (1.2.0)
+    polyamorous (1.3.1)
       activerecord (>= 3.0)
     powerpack (0.1.1)
-    procto (0.0.2)
+    procto (0.0.3)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    public_suffix (2.0.5)
+    puma (3.8.2)
     que (0.10.0)
     que-web (0.4.0)
       erubis
       que (~> 0.8)
       sinatra
-    rack (1.6.4)
+    rack (1.6.5)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -390,9 +396,9 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -403,31 +409,31 @@ GEM
       activesupport (= 4.2.5.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.0.0)
-    raindrops (0.15.0)
-    rake (10.5.0)
+    rainbow (2.2.1)
+    raindrops (0.18.0)
+    rake (12.0.0)
     ransack (1.5.1)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
       polyamorous (~> 1.1)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rdoc (4.2.0)
+    rdoc (4.3.0)
     reek (1.6.5)
       parser (~> 2.2.0.pre.7)
       rainbow (>= 1.99, < 3.0)
       unparser (~> 0.2.2)
     ref (2.0.0)
     request_store (1.1.0)
-    responders (2.1.1)
+    responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
-    rest-client (1.8.0)
+    rest-client (2.0.1)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -455,11 +461,12 @@ GEM
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
+    ruby-progressbar (1.8.1)
     ruby2ruby (2.1.4)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.7.1)
+    ruby_dep (1.5.0)
+    ruby_parser (3.7.3)
       sexp_processor (~> 4.1)
     rubycritic (1.4.0)
       flay (= 2.4.0)
@@ -468,7 +475,7 @@ GEM
       reek (= 1.6.5)
       virtus (~> 1.0)
     safe_yaml (1.0.4)
-    sass (3.4.18)
+    sass (3.4.23)
     sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -489,7 +496,7 @@ GEM
     select2-rails (3.5.9.3)
       thor (~> 0.14)
     selectize-rails (0.12.1)
-    sexp_processor (4.6.0)
+    sexp_processor (4.8.0)
     shellany (0.0.1)
     simplecov (0.10.0)
       docile (~> 1.1.0)
@@ -497,43 +504,45 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     simpleidn (0.0.7)
-    sinatra (1.4.6)
-      rack (~> 1.4)
+    sinatra (1.4.8)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     slop (3.6.0)
+    socksify (1.7.1)
     spring (1.3.6)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (3.5.2)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sys-uname (0.9.0)
       ffi (>= 1.0.0)
-    terminal-table (1.5.2)
+    terminal-table (1.7.3)
+      unicode-display_width (~> 1.1.1)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.19.1)
-    thread_safe (0.3.5)
+    thor (0.19.4)
+    thread_safe (0.3.6)
     tilt (1.4.1)
     turbolinks (2.5.3)
       coffee-rails
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
-    unicorn (4.9.0)
+    unf_ext (0.0.7.2)
+    unicode-display_width (1.1.3)
+    unicorn (5.3.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
     uniform_notifier (1.9.0)
     unparser (0.2.4)
@@ -552,16 +561,16 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    warden (1.2.6)
+    warden (1.2.7)
       rack (>= 1.0)
     wasabi (3.5.0)
       httpi (~> 2.0)
       nokogiri (>= 1.4.2)
-    webmock (2.1.0)
+    webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     whenever (0.9.4)

From 44ac6be2b6b819eba194502b9bf8e6e755383f75 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Tue, 4 Apr 2017 15:14:42 +0300
Subject: [PATCH 10/36] pg to 0.19.0

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 110043140..adccc72b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'rest-client'
 gem 'figaro', '1.1.1'
 
 # model related
-gem 'pg',                        '0.18.2'
+gem 'pg',                        '0.19.0'
 gem 'ransack',                   '1.5.1' # for searching
 gem 'validates_email_format_of', '1.6.3' # validates email against RFC 2822 and RFC 3696
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ce51ad948..74130cfbd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -348,7 +348,7 @@ GEM
     parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     pdfkit (0.6.2)
-    pg (0.18.2)
+    pg (0.19.0)
     phantomjs (1.9.8.0)
     phantomjs-binaries (1.9.2.4)
       sys-uname (= 0.9.0)
@@ -631,7 +631,7 @@ DEPENDENCIES
   nprogress-rails (= 0.1.6.7)
   paper_trail!
   pdfkit (= 0.6.2)
-  pg (= 0.18.2)
+  pg (= 0.19.0)
   phantomjs (= 1.9.8.0)
   phantomjs-binaries (= 1.9.2.4)
   poltergeist (= 1.6.0)

From afc0db0a1ecaa4020e9349d851f8d5d4a120ec42 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Tue, 4 Apr 2017 17:05:26 +0300
Subject: [PATCH 11/36] update nokogiri to 1.7.1

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index adccc72b6..dcc84fa22 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ gem 'rails-settings-cached',     '0.4.1' # for settings
 
 # html-xml
 gem 'haml-rails', '0.9.0' # haml for views
-gem 'nokogiri',   '1.6.8' # For XML parsing
+gem 'nokogiri',   '1.7.1' # For XML parsing
 
 # style
 gem 'sass-rails',     '5.0.3'   # sass style
diff --git a/Gemfile.lock b/Gemfile.lock
index 74130cfbd..d83f27393 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -266,7 +266,7 @@ GEM
     html2haml (2.0.0)
       erubis (~> 2.7.0)
       haml (~> 4.0.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.7.0)
       ruby_parser (~> 3.5)
     html5_validators (1.2.2)
     http-cookie (1.0.3)
@@ -335,9 +335,8 @@ GEM
     multi_xml (0.6.0)
     nenv (0.3.0)
     netrc (0.11.0)
-    nokogiri (1.6.8)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     nori (2.6.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -352,7 +351,6 @@ GEM
     phantomjs (1.9.8.0)
     phantomjs-binaries (1.9.2.4)
       sys-uname (= 0.9.0)
-    pkg-config (1.1.7)
     poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -627,7 +625,7 @@ DEPENDENCIES
   liquid (= 3.0.6)
   mina (= 0.3.1)
   money-rails (= 1.4.1)
-  nokogiri (= 1.6.8)
+  nokogiri (= 1.7.1)
   nprogress-rails (= 0.1.6.7)
   paper_trail!
   pdfkit (= 0.6.2)

From acc5201e35be10bc6358fd5438c9b9b15cb81dd6 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Wed, 5 Apr 2017 08:58:13 +0300
Subject: [PATCH 12/36] update nokogiri freely

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index dcc84fa22..e6d22283f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ gem 'rails-settings-cached',     '0.4.1' # for settings
 
 # html-xml
 gem 'haml-rails', '0.9.0' # haml for views
-gem 'nokogiri',   '1.7.1' # For XML parsing
+gem 'nokogiri'  # For XML parsing
 
 # style
 gem 'sass-rails',     '5.0.3'   # sass style
diff --git a/Gemfile.lock b/Gemfile.lock
index d83f27393..9e6a22a40 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -396,7 +396,7 @@ GEM
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
+      nokogiri (~> 1.7)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -625,7 +625,7 @@ DEPENDENCIES
   liquid (= 3.0.6)
   mina (= 0.3.1)
   money-rails (= 1.4.1)
-  nokogiri (= 1.7.1)
+  nokogiri
   nprogress-rails (= 0.1.6.7)
   paper_trail!
   pdfkit (= 0.6.2)

From fe5418fb026abc71888f2b6d8a5a274bc14699ff Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Wed, 5 Apr 2017 08:59:20 +0300
Subject: [PATCH 13/36] upgrade rails

---
 Gemfile      |  2 +-
 Gemfile.lock | 62 ++++++++++++++++++++++++++--------------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index e6d22283f..e1d3d48e5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ end if Bundler::VERSION < '2'
 source 'https://rubygems.org'
 
 # core
-gem 'rails',        '4.2.5.2' # when update, all initializers eis_custom files needs check/update
+gem 'rails',        '4.2.7.1' # when update, all initializers eis_custom files needs check/update
 gem 'iso8601',      '0.8.6' # for dates and times
 gem 'hashie-forbidden_attributes', '0.1.1'
 gem 'SyslogLogger', '2.0', require: 'syslog/logger'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9e6a22a40..f8d66b67f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,38 +58,38 @@ GEM
   specs:
     SyslogLogger (2.0)
     abstract_type (0.0.7)
-    actionmailer (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.2)
-      actionview (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
     activerecord-import (0.7.0)
       activerecord (>= 3.0)
-    activesupport (4.2.5.2)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -381,30 +381,30 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     railroady (1.3.0)
-    rails (4.2.5.2)
-      actionmailer (= 4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activerecord (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.2)
+      railties (= 4.2.7.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.7)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails-settings-cached (0.4.1)
       rails (>= 4.0.0)
-    railties (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.1)
@@ -638,7 +638,7 @@ DEPENDENCIES
   que-web (= 0.4.0)
   que_mailer!
   railroady (= 1.3.0)
-  rails (= 4.2.5.2)
+  rails (= 4.2.7.1)
   rails-settings-cached (= 0.4.1)
   ransack (= 1.5.1)
   rest-client

From d899b340d1f53635206e64812e784687b32a11fa Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Wed, 5 Apr 2017 09:10:31 +0300
Subject: [PATCH 14/36] update rspec

---
 Gemfile      |  2 +-
 Gemfile.lock | 40 ++++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index e1d3d48e5..3cb0faba2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -119,7 +119,7 @@ end
 
 group :development, :test do
   # test stack
-  gem 'rspec-rails',        '3.3.2'
+  gem 'rspec-rails',        '3.5.0'
   gem 'capybara',           '2.4.4'
   gem 'phantomjs-binaries', '1.9.2.4'
   gem 'poltergeist',        '1.6.0'  # We are using PhantomJS instead
diff --git a/Gemfile.lock b/Gemfile.lock
index f8d66b67f..4b9faaf64 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -432,27 +432,27 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-rails (3.3.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     rubocop (0.32.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.2.5, < 3.0)
@@ -642,7 +642,7 @@ DEPENDENCIES
   rails-settings-cached (= 0.4.1)
   ransack (= 1.5.1)
   rest-client
-  rspec-rails (= 3.3.2)
+  rspec-rails (= 3.5.0)
   rubocop (= 0.32.1)
   rubycritic (= 1.4.0)
   sass-rails (= 5.0.3)

From 50b9150ed8e7fbe6560d566f5e10c97b359076f8 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Wed, 5 Apr 2017 10:06:47 +0300
Subject: [PATCH 15/36] update html2haml, locked in nokogiri

---
 Gemfile      |  4 ++--
 Gemfile.lock | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3cb0faba2..acdc8fff2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ gem 'rails-settings-cached',     '0.4.1' # for settings
 
 # html-xml
 gem 'haml-rails', '0.9.0' # haml for views
-gem 'nokogiri'  # For XML parsing
+gem 'nokogiri', '1.7.1' # For XML parsing
 
 # style
 gem 'sass-rails',     '5.0.3'   # sass style
@@ -140,7 +140,7 @@ group :development, :test do
   gem 'brakeman',      '3.0.5', require: false # for security audit'
   # tmp, otherwise conflics with breakman
   # gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d'
-  gem 'html2haml',     '2.0.0'
+  gem 'html2haml',     '2.1.0'
   gem 'sdoc',          '0.4.1'  # bundle exec rake doc:rails generates the API under doc/api.
   gem 'railroady',     '1.3.0'  # to generate database diagrams
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b9faaf64..82f82d495 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -263,10 +263,10 @@ GEM
       hashie (>= 3.0)
     highline (1.6.21)
     hpricot (0.8.6)
-    html2haml (2.0.0)
+    html2haml (2.1.0)
       erubis (~> 2.7.0)
-      haml (~> 4.0.0)
-      nokogiri (~> 1.7.0)
+      haml (~> 4.0)
+      nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
     html5_validators (1.2.2)
     http-cookie (1.0.3)
@@ -612,7 +612,7 @@ DEPENDENCIES
   guard-rubocop (= 1.2.0)
   haml-rails (= 0.9.0)
   hashie-forbidden_attributes (= 0.1.1)
-  html2haml (= 2.0.0)
+  html2haml (= 2.1.0)
   html5_validators (= 1.2.2)
   isikukood
   iso8601 (= 0.8.6)
@@ -625,7 +625,7 @@ DEPENDENCIES
   liquid (= 3.0.6)
   mina (= 0.3.1)
   money-rails (= 1.4.1)
-  nokogiri
+  nokogiri (= 1.7.1)
   nprogress-rails (= 0.1.6.7)
   paper_trail!
   pdfkit (= 0.6.2)

From e820097beebcdfd1c94d7df55569e9248b069d14 Mon Sep 17 00:00:00 2001
From: Georg <teadur@users.noreply.github.com>
Date: Wed, 5 Apr 2017 12:47:17 +0300
Subject: [PATCH 16/36] Update CHANGELOG.md

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b413ccfbe..4d44783e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+05.04.2017
+* Fixed validation error on valid legaldocs in the portal for registrars [#432](https://github.com/internetee/registry/issues/432)
+* Updated Ruby, nokogiri and variouse other dependent gems to fix security issues
+
+14.03.2017
+* Improved phone number validation [#386](https://github.com/internetee/registry/issues/386)
+* Dropped ddoc support from legaldocs in the portal for regsitrars [#270](https://github.com/internetee/registry/issues/270)
+* Bug: Domain in exp pending list whithout the state present [#328](https://github.com/internetee/registry/issues/328)
+* Base64 of legaldocs filtered out from syslogs [#314](https://github.com/internetee/registry/issues/314)
+
 02.03.2017
 * Domain list download (csv) functionality in the portal for registrars (#248)
 * Readme updates (#273)

From b0f75ad250af1af9c704ef6dbf987cc99b06782d Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Thu, 6 Apr 2017 16:19:19 +0300
Subject: [PATCH 17/36] regenerate Gemfile.lock

---
 Gemfile.lock | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 82f82d495..991fc5d2d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -193,7 +193,7 @@ GEM
       nokogiri (>= 1.4.0)
       savon (>= 2.4.0)
     docile (1.1.5)
-    domain_name (0.5.20170223)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
     erubis (2.7.0)
@@ -365,7 +365,6 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
-    puma (3.8.2)
     que (0.10.0)
     que-web (0.4.0)
       erubis

From 9de81b05fa5da4dadb79fc7365587829d1bf1e30 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 15:33:35 +0300
Subject: [PATCH 18/36] update rubocop, rubycritic, brakeman, rspec/sass-rails

---
 Gemfile      |  10 ++---
 Gemfile.lock | 109 +++++++++++++++++++--------------------------------
 2 files changed, 46 insertions(+), 73 deletions(-)

diff --git a/Gemfile b/Gemfile
index acdc8fff2..3c5aef8f4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'haml-rails', '0.9.0' # haml for views
 gem 'nokogiri', '1.7.1' # For XML parsing
 
 # style
-gem 'sass-rails',     '5.0.3'   # sass style
+gem 'sass-rails',     '5.0.6'   # sass style
 gem 'bootstrap-sass', '3.3.5.1' # bootstrap style
 
 # js
@@ -110,7 +110,7 @@ group :development do
   gem 'guard',                 '2.12.9' # run tests automatically
   gem 'guard-rspec',           '4.5.2'
   gem 'guard-rails',           '0.7.1' # run EPP server automatically
-  gem 'rubocop',               '0.32.1'
+  gem 'rubocop',               '0.48.1'
   gem 'guard-rubocop',         '1.2.0'
 
   # deploy
@@ -119,7 +119,7 @@ end
 
 group :development, :test do
   # test stack
-  gem 'rspec-rails',        '3.5.0'
+  gem 'rspec-rails',        '3.5.2'
   gem 'capybara',           '2.4.4'
   gem 'phantomjs-binaries', '1.9.2.4'
   gem 'poltergeist',        '1.6.0'  # We are using PhantomJS instead
@@ -132,12 +132,12 @@ group :development, :test do
 
   # code review
   gem 'simplecov',     '0.10.0', require: false
-  gem 'rubycritic',    '1.4.0'
+  gem 'rubycritic',    '3.2.0'
   gem 'bullet',        '4.14.7' # for finding database optimizations
   gem 'bundler-audit',
     github: 'rubysec/bundler-audit',
     ref: 'f89ef7fae1090bbad825ea76812d56d72b417055' # for finding future vulnerable gems
-  gem 'brakeman',      '3.0.5', require: false # for security audit'
+  gem 'brakeman',      '3.6.1', require: false # for security audit'
   # tmp, otherwise conflics with breakman
   # gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d'
   gem 'html2haml',     '2.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 991fc5d2d..a9879fc01 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,7 +57,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     SyslogLogger (2.0)
-    abstract_type (0.0.7)
     actionmailer (4.2.7.1)
       actionpack (= 4.2.7.1)
       actionview (= 4.2.7.1)
@@ -95,9 +94,6 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     airbrake (6.0.0)
@@ -108,8 +104,6 @@ GEM
       nokogiri
     arel (6.0.4)
     ast (2.3.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
     autodoc (0.6.0)
       actionpack
       activesupport (>= 3.0.0)
@@ -126,16 +120,7 @@ GEM
     bootstrap-sass (3.3.5.1)
       autoprefixer-rails (>= 5.0.0.1)
       sass (>= 3.3.0)
-    brakeman (3.0.5)
-      erubis (~> 2.6)
-      fastercsv (~> 1.5)
-      haml (>= 3.0, < 5.0)
-      highline (~> 1.6.20)
-      multi_json (~> 1.2)
-      ruby2ruby (~> 2.1.1)
-      ruby_parser (~> 3.7.0)
-      sass (~> 3.0)
-      terminal-table (~> 1.4)
+    brakeman (3.6.1)
     builder (3.2.3)
     bullet (4.14.7)
       activesupport (>= 3.0.0)
@@ -149,6 +134,8 @@ GEM
       xpath (~> 2.0)
     chronic (0.10.2)
     cliver (0.3.2)
+    codeclimate-engine-rb (0.4.0)
+      virtus (~> 1.0)
     coderay (1.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -159,9 +146,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
     concurrent-ruby (1.0.5)
     countries (0.11.4)
       currencies (~> 0.4.2)
@@ -185,7 +169,7 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     digidoc_client (0.2.1)
       crack (>= 0.1.8)
       httpclient (>= 2.3.4)
@@ -204,16 +188,18 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    fastercsv (1.5.5)
     ffi (1.9.18)
     figaro (1.1.1)
       thor (~> 0.14)
-    flay (2.4.0)
+    flay (2.8.1)
+      erubis (~> 2.7.0)
+      path_expander (~> 1.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
-    flog (4.2.1)
+    flog (4.6.1)
+      path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
-      sexp_processor (~> 4.4)
+      sexp_processor (~> 4.8)
     formatador (0.2.5)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
@@ -261,7 +247,6 @@ GEM
     hashie (3.5.5)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
-    highline (1.6.21)
     hpricot (0.8.6)
     html2haml (2.1.0)
       erubis (~> 2.7.0)
@@ -311,8 +296,6 @@ GEM
     lumberjack (1.0.11)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -344,8 +327,9 @@ GEM
     nprogress-rails (0.1.6.7)
     open4 (1.3.4)
     orm_adapter (0.5.0)
-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    path_expander (1.0.1)
     pdfkit (0.6.2)
     pg (0.19.0)
     phantomjs (1.9.8.0)
@@ -359,7 +343,6 @@ GEM
     polyamorous (1.3.1)
       activerecord (>= 3.0)
     powerpack (0.1.1)
-    procto (0.0.3)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -419,10 +402,10 @@ GEM
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rdoc (4.3.0)
-    reek (1.6.5)
-      parser (~> 2.2.0.pre.7)
-      rainbow (>= 1.99, < 3.0)
-      unparser (~> 0.2.2)
+    reek (4.6.1)
+      codeclimate-engine-rb (~> 0.4.0)
+      parser (>= 2.3.1.2, < 2.5)
+      rainbow (~> 2.0)
     ref (2.0.0)
     request_store (1.1.0)
     responders (2.3.0)
@@ -443,7 +426,7 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.0)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -452,33 +435,33 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.32.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
+    rubocop (0.48.1)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    ruby2ruby (2.1.4)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
     ruby_dep (1.5.0)
-    ruby_parser (3.7.3)
+    ruby_parser (3.8.4)
       sexp_processor (~> 4.1)
-    rubycritic (1.4.0)
-      flay (= 2.4.0)
-      flog (= 4.2.1)
-      parser (>= 2.2.0, < 3.0)
-      reek (= 1.6.5)
+    rubycritic (3.2.0)
+      flay (~> 2.8)
+      flog (~> 4.4)
+      launchy (= 2.4.3)
+      parser (= 2.4.0)
+      rainbow (~> 2.1)
+      reek (~> 4.4)
+      ruby_parser (~> 3.8)
       virtus (~> 1.0)
     safe_yaml (1.0.4)
     sass (3.4.23)
-    sass-rails (5.0.3)
-      railties (>= 4.0.0, < 5.0)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     savon (2.11.1)
       akami (~> 1.2)
       builder (>= 2.1.2)
@@ -519,8 +502,6 @@ GEM
       sprockets (>= 3.0.0)
     sys-uname (0.9.0)
       ffi (>= 1.0.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
@@ -537,19 +518,11 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.2.0)
     unicorn (5.3.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.9.0)
-    unparser (0.2.4)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.2.5)
-      equalizer (~> 0.0.9)
-      parser (~> 2.2.2)
-      procto (~> 0.0.2)
     uuidtools (2.1.5)
     validates_email_format_of (1.6.3)
       i18n
@@ -585,7 +558,7 @@ DEPENDENCIES
   autodoc
   bootstrap-datepicker-rails (= 1.3.1.1)
   bootstrap-sass (= 3.3.5.1)
-  brakeman (= 3.0.5)
+  brakeman (= 3.6.1)
   bullet (= 4.14.7)
   bundler-audit!
   cancancan (= 1.11.0)
@@ -641,10 +614,10 @@ DEPENDENCIES
   rails-settings-cached (= 0.4.1)
   ransack (= 1.5.1)
   rest-client
-  rspec-rails (= 3.5.0)
-  rubocop (= 0.32.1)
-  rubycritic (= 1.4.0)
-  sass-rails (= 5.0.3)
+  rspec-rails (= 3.5.2)
+  rubocop (= 0.48.1)
+  rubycritic (= 3.2.0)
+  sass-rails (= 5.0.6)
   sdoc (= 0.4.1)
   select2-rails (= 3.5.9.3)
   selectize-rails (= 0.12.1)
@@ -662,4 +635,4 @@ DEPENDENCIES
   whenever (= 0.9.4)
 
 BUNDLED WITH
-   1.13.6
+   1.14.6

From 3d16656e177455820f1faa6fc9da2d5acf704e67 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 15:53:48 +0300
Subject: [PATCH 19/36] update money-rails, countries and digidoc_client

---
 Gemfile      |  6 +++---
 Gemfile.lock | 34 +++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3c5aef8f4..f4dbae4c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem 'jbuilder', '2.2.16'  # json api
 # registry specfic
 gem 'simpleidn', '0.0.7' # For punycode
 gem 'isikukood' # for EE-id validation
-gem 'money-rails', '1.4.1'
+gem 'money-rails', '1.8.0'
 
 # deploy
 gem 'whenever', '0.9.4', require: false
@@ -75,13 +75,13 @@ gem 'data_migrate',
   ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81'
 
 # country listing
-gem 'countries', '0.11.4'
+gem 'countries', '2.0.8'
 
 # cloning activerecord objects
 gem 'deep_cloneable', '2.1.1'
 
 # id + mid login
-gem 'digidoc_client', '0.2.1'
+gem 'digidoc_client', '0.3.0'
 
 gem 'epp', '1.5.0', github: 'internetee/epp'
 gem 'epp-xml', '1.1.0', github: 'internetee/epp-xml'
diff --git a/Gemfile.lock b/Gemfile.lock
index a9879fc01..5e761d7f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -147,12 +147,13 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    countries (0.11.4)
-      currencies (~> 0.4.2)
+    countries (2.0.8)
       i18n_data (~> 0.7.0)
+      money (~> 6.7)
+      sixarm_ruby_unaccent (~> 1.1)
+      unicode_utils (~> 1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    currencies (0.4.2)
     daemons (1.2.4)
     daemons-rails (1.2.1)
       daemons
@@ -170,7 +171,7 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.3)
-    digidoc_client (0.2.1)
+    digidoc_client (0.3.0)
       crack (>= 0.1.8)
       httpclient (>= 2.3.4)
       mime-types (>= 1.16)
@@ -260,7 +261,7 @@ GEM
     httpi (2.4.2)
       rack
       socksify
-    i18n (0.7.0)
+    i18n (0.8.1)
     i18n_data (0.7.0)
     ice_nine (0.11.2)
     isikukood (0.1.2)
@@ -305,14 +306,15 @@ GEM
       rake
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    monetize (1.1.0)
-      money (~> 6.5.0)
-    money (6.5.1)
-      i18n (>= 0.6.4, <= 0.7.0)
-    money-rails (1.4.1)
+    monetize (1.6.0)
+      money (~> 6.8)
+    money (6.8.3)
+      i18n (>= 0.6.4, < 0.9)
+      sixarm_ruby_unaccent (>= 1.1.1, < 2)
+    money-rails (1.8.0)
       activesupport (>= 3.0)
-      monetize (~> 1.1.0)
-      money (~> 6.5.0)
+      monetize (~> 1.6.0)
+      money (~> 6.8.1)
       railties (>= 3.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
@@ -488,6 +490,7 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
+    sixarm_ruby_unaccent (1.1.1)
     slop (3.6.0)
     socksify (1.7.1)
     spring (1.3.6)
@@ -519,6 +522,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.2)
     unicode-display_width (1.2.0)
+    unicode_utils (1.4.0)
     unicorn (5.3.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -565,13 +569,13 @@ DEPENDENCIES
   capybara (= 2.4.4)
   coderay (= 1.1.0)
   coffee-rails (= 4.1.0)
-  countries (= 0.11.4)
+  countries (= 2.0.8)
   daemons-rails (= 1.2.1)
   data_migrate!
   database_cleaner
   deep_cloneable (= 2.1.1)
   devise (= 3.5.4)
-  digidoc_client (= 0.2.1)
+  digidoc_client (= 0.3.0)
   epp (= 1.5.0)!
   epp-xml (= 1.1.0)!
   fabrication (= 2.13.2)
@@ -596,7 +600,7 @@ DEPENDENCIES
   launchy (= 2.4.3)
   liquid (= 3.0.6)
   mina (= 0.3.1)
-  money-rails (= 1.4.1)
+  money-rails (= 1.8.0)
   nokogiri (= 1.7.1)
   nprogress-rails (= 0.1.6.7)
   paper_trail!

From 1a3a424c537457468ab8e0809cba3160b93b9f63 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 16:16:06 +0300
Subject: [PATCH 20/36] try digidoc master

---
 Gemfile      |  6 +++++-
 Gemfile.lock | 20 +++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index f4dbae4c5..3d251e351 100644
--- a/Gemfile
+++ b/Gemfile
@@ -81,7 +81,11 @@ gem 'countries', '2.0.8'
 gem 'deep_cloneable', '2.1.1'
 
 # id + mid login
-gem 'digidoc_client', '0.3.0'
+#gem 'digidoc_client', '0.3.0'
+gem 'digidoc_client',
+    github: 'tarmotalu/digidoc_client',
+    ref: '1645e83a5a548addce383f75703b0275c5310c32'
+
 
 gem 'epp', '1.5.0', github: 'internetee/epp'
 gem 'epp-xml', '1.1.0', github: 'internetee/epp-xml'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5e761d7f7..d31e03a11 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,6 +53,18 @@ GIT
       bundler (~> 1.2)
       thor (~> 0.18)
 
+GIT
+  remote: https://github.com/tarmotalu/digidoc_client.git
+  revision: 1645e83a5a548addce383f75703b0275c5310c32
+  ref: 1645e83a5a548addce383f75703b0275c5310c32
+  specs:
+    digidoc_client (0.3.0)
+      crack (>= 0.1.8)
+      httpclient (>= 2.3.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.4.0)
+      savon (>= 2.4.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -171,12 +183,6 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.3)
-    digidoc_client (0.3.0)
-      crack (>= 0.1.8)
-      httpclient (>= 2.3.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.4.0)
-      savon (>= 2.4.0)
     docile (1.1.5)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
@@ -575,7 +581,7 @@ DEPENDENCIES
   database_cleaner
   deep_cloneable (= 2.1.1)
   devise (= 3.5.4)
-  digidoc_client (= 0.3.0)
+  digidoc_client!
   epp (= 1.5.0)!
   epp-xml (= 1.1.0)!
   fabrication (= 2.13.2)

From 12d80ce2cc1197fbec577b9614fee7f5be9e2213 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 16:34:50 +0300
Subject: [PATCH 21/36] follow digidoc git master, disable digidoc initializer

---
 Gemfile                        | 2 +-
 config/initializers/digidoc.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3d251e351..28549ba7c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,7 +84,7 @@ gem 'deep_cloneable', '2.1.1'
 #gem 'digidoc_client', '0.3.0'
 gem 'digidoc_client',
     github: 'tarmotalu/digidoc_client',
-    ref: '1645e83a5a548addce383f75703b0275c5310c32'
+    branch: 'master'
 
 
 gem 'epp', '1.5.0', github: 'internetee/epp'
diff --git a/config/initializers/digidoc.rb b/config/initializers/digidoc.rb
index 2b103f750..0090c420d 100644
--- a/config/initializers/digidoc.rb
+++ b/config/initializers/digidoc.rb
@@ -1 +1 @@
-Digidoc::Client.logger = Rails.application.config.logger
+#Digidoc::Client.logger = Rails.application.config.logger

From 1a315363df41fc9800e49b22ff5d8bcd6b5a4a29 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 16:45:06 +0300
Subject: [PATCH 22/36] use new Cops syntax, ignore example files

---
 .rubocop.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index c9689567c..da8ac641f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,10 +1,12 @@
 AllCops:
-  RunRailsCops: true
-
-  Exclude:
+    Rails:
+        Enabled: True
+    Exclude:
     - 'Guardfile'
     # stuff generated by AR and rails
     - 'config/deploy-example.rb'
+    - 'config/environments/development-example.rb'
+    - 'config/environments/staging-example.rb'
     - 'db/schema.rb'
     - 'db/schema-read-only.rb'
     - 'db/whois_schema.rb'

From c92185ccb581cd54f78707969ae5e45ca5b9e6d0 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 16:59:46 +0300
Subject: [PATCH 23/36] move back to 1.x countries

---
 Gemfile      |  3 ++-
 Gemfile.lock | 12 +++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 28549ba7c..7a02ebb7a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,7 +75,8 @@ gem 'data_migrate',
   ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81'
 
 # country listing
-gem 'countries', '2.0.8'
+#gem 'countries', '2.0.8'
+gem 'countries', '1.2.5'
 
 # cloning activerecord objects
 gem 'deep_cloneable', '2.1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index d31e03a11..f0899e38b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,7 +56,7 @@ GIT
 GIT
   remote: https://github.com/tarmotalu/digidoc_client.git
   revision: 1645e83a5a548addce383f75703b0275c5310c32
-  ref: 1645e83a5a548addce383f75703b0275c5310c32
+  branch: master
   specs:
     digidoc_client (0.3.0)
       crack (>= 0.1.8)
@@ -159,13 +159,12 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    countries (2.0.8)
+    countries (1.2.5)
+      currencies (~> 0.4.2)
       i18n_data (~> 0.7.0)
-      money (~> 6.7)
-      sixarm_ruby_unaccent (~> 1.1)
-      unicode_utils (~> 1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    currencies (0.4.2)
     daemons (1.2.4)
     daemons-rails (1.2.1)
       daemons
@@ -528,7 +527,6 @@ GEM
       unf_ext
     unf_ext (0.0.7.2)
     unicode-display_width (1.2.0)
-    unicode_utils (1.4.0)
     unicorn (5.3.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -575,7 +573,7 @@ DEPENDENCIES
   capybara (= 2.4.4)
   coderay (= 1.1.0)
   coffee-rails (= 4.1.0)
-  countries (= 2.0.8)
+  countries (= 1.2.5)
   daemons-rails (= 1.2.1)
   data_migrate!
   database_cleaner

From 1444590b1b34c847677c4bc768f6ee60f4686569 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 17:12:38 +0300
Subject: [PATCH 24/36] require countries/global

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 7a02ebb7a..bbc463b1a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,7 @@ gem 'data_migrate',
 
 # country listing
 #gem 'countries', '2.0.8'
-gem 'countries', '1.2.5'
+gem 'countries', '1.2.5', :require => 'countries/global'
 
 # cloning activerecord objects
 gem 'deep_cloneable', '2.1.1'

From e5d7c6c740bd564365b98b2dd746742c33683ac1 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 17:37:28 +0300
Subject: [PATCH 25/36] fix sorted_country

---
 .rubocop.yml          | 2 --
 lib/sorted_country.rb | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index da8ac641f..0857a9120 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,4 @@
 AllCops:
-    Rails:
-        Enabled: True
     Exclude:
     - 'Guardfile'
     # stuff generated by AR and rails
diff --git a/lib/sorted_country.rb b/lib/sorted_country.rb
index 1fc514d3f..e831c007b 100644
--- a/lib/sorted_country.rb
+++ b/lib/sorted_country.rb
@@ -32,12 +32,12 @@ class SortedCountry
     end
 
     def all_sorted
-      @all_sorted ||= Country.all.sort_by { |name, _code| name.first }
+      @all_sorted ||= Country.all.sort_by(&:name)
     end
 
     def all_sorted_truncated
-      @all_sorted_truncated ||= 
-        all_sorted.map { |name, code| [truncate(name, length: 26), code] }
+      @all_sorted_truncated ||=
+        all_sorted.map { |country| [truncate(name, length: 26), country.alpha2] }
     end
   end
 end

From 20b521576904072393bac046f8d387c0d84181c9 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 17:52:37 +0300
Subject: [PATCH 26/36] use latest countries

---
 Gemfile      |  3 +--
 Gemfile.lock | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index bbc463b1a..5f973598e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,8 +75,7 @@ gem 'data_migrate',
   ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81'
 
 # country listing
-#gem 'countries', '2.0.8'
-gem 'countries', '1.2.5', :require => 'countries/global'
+gem 'countries', :require => 'countries/global'
 
 # cloning activerecord objects
 gem 'deep_cloneable', '2.1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index f0899e38b..27375b23a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -159,12 +159,13 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    countries (1.2.5)
-      currencies (~> 0.4.2)
+    countries (2.0.8)
       i18n_data (~> 0.7.0)
+      money (~> 6.7)
+      sixarm_ruby_unaccent (~> 1.1)
+      unicode_utils (~> 1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    currencies (0.4.2)
     daemons (1.2.4)
     daemons-rails (1.2.1)
       daemons
@@ -527,6 +528,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.2)
     unicode-display_width (1.2.0)
+    unicode_utils (1.4.0)
     unicorn (5.3.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -573,7 +575,7 @@ DEPENDENCIES
   capybara (= 2.4.4)
   coderay (= 1.1.0)
   coffee-rails (= 4.1.0)
-  countries (= 1.2.5)
+  countries
   daemons-rails (= 1.2.1)
   data_migrate!
   database_cleaner

From 353d4b74f775c9b2a279aaff59f2b3682953407f Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 18:09:42 +0300
Subject: [PATCH 27/36] add .reek config file

---
 .reek | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .reek

diff --git a/.reek b/.reek
new file mode 100644
index 000000000..d94291666
--- /dev/null
+++ b/.reek
@@ -0,0 +1,3 @@
+exclude_paths:
+   - db/migrate/
+   - db/data/

From bc737f064aa614125fa321f461ee74a95bc14682 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 18:59:21 +0300
Subject: [PATCH 28/36] use latest money-rails

---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5f973598e..d570ed721 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem 'jbuilder', '2.2.16'  # json api
 # registry specfic
 gem 'simpleidn', '0.0.7' # For punycode
 gem 'isikukood' # for EE-id validation
-gem 'money-rails', '1.8.0'
+gem 'money-rails'
 
 # deploy
 gem 'whenever', '0.9.4', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 27375b23a..f49dab70d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -606,7 +606,7 @@ DEPENDENCIES
   launchy (= 2.4.3)
   liquid (= 3.0.6)
   mina (= 0.3.1)
-  money-rails (= 1.8.0)
+  money-rails
   nokogiri (= 1.7.1)
   nprogress-rails (= 0.1.6.7)
   paper_trail!

From d1d3480546c2beeb9080d2136bc0c1abcafd3fe9 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 19:53:22 +0300
Subject: [PATCH 29/36] fix typo #306

---
 doc/epp/contact.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/epp/contact.md b/doc/epp/contact.md
index dbfdc893f..3ec314b9e 100644
--- a/doc/epp/contact.md
+++ b/doc/epp/contact.md
@@ -39,7 +39,7 @@ More info: https://en.wikipedia.org/wiki/Latin_script_in_Unicode
         <eis:ident>            1        Contact identificator 
                                           Attribute: "type"
                                             "org"          # Business registry code
-                                            "priv"         # National idendtification number
+                                            "priv"         # National identification number
                                             "birthday"     # Birthday date in format in YYYY-MM-DD
                                           Attribute: "cc"
                                             "EE"           # Country code in ISO_3166-1 aplha 2
@@ -76,7 +76,7 @@ More info: https://en.wikipedia.org/wiki/Latin_script_in_Unicode
         <eis:ident>             0-1      Contact identificator 
                                           Attribute: "type"
                                             "org"          # Business registry code
-                                            "priv"         # National idendtification number
+                                            "priv"         # National identification number
                                             "birthday"     # Birthday date in format in YYYY-MM-DD
                                           Attribute: "cc"
                                             "EE"           # Country code in ISO_3166-1 aplha 2

From dc33d1aff3851bf6a9a02fb5bb4092b7731d1d8e Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 20:35:39 +0300
Subject: [PATCH 30/36] codeclimate configuration

---
 .codeclimate.yml |  45 ++++++++
 .csslintrc       |   2 +
 .eslintignore    |   1 +
 .eslintrc.yml    | 277 +++++++++++++++++++++++++++++++++++++++++++++++
 coffeelint.json  | 129 ++++++++++++++++++++++
 5 files changed, 454 insertions(+)
 create mode 100644 .codeclimate.yml
 create mode 100644 .csslintrc
 create mode 100644 .eslintignore
 create mode 100644 .eslintrc.yml
 create mode 100644 coffeelint.json

diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 000000000..99383daf4
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,45 @@
+---
+engines:
+  brakeman:
+    enabled: true
+  bundler-audit:
+    enabled: true
+  csslint:
+    enabled: true
+  coffeelint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+      - python
+      - php
+  eslint:
+    enabled: true
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - Gemfile.lock
+  - "**.erb"
+  - "**.haml"
+  - "**.rb"
+  - "**.rhtml"
+  - "**.slim"
+  - "**.css"
+  - "**.coffee"
+  - "**.inc"
+  - "**.js"
+  - "**.jsx"
+  - "**.module"
+  - "**.php"
+  - "**.py"
+exclude_paths:
+- config/
+- db/
+- spec/
+- vendor/
diff --git a/.csslintrc b/.csslintrc
new file mode 100644
index 000000000..aacba956e
--- /dev/null
+++ b/.csslintrc
@@ -0,0 +1,2 @@
+--exclude-exts=.min.css
+--ignore=adjoining-classes,box-model,ids,order-alphabetical,unqualified-attributes
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 000000000..96212a359
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+**/*{.,-}min.js
diff --git a/.eslintrc.yml b/.eslintrc.yml
new file mode 100644
index 000000000..a6a0ce9c4
--- /dev/null
+++ b/.eslintrc.yml
@@ -0,0 +1,277 @@
+---
+parserOptions:
+  sourceType: module
+  ecmaFeatures:
+    jsx: true
+
+env:
+  amd: true
+  browser: true
+  es6: true
+  jquery: true
+  node: true
+
+# http://eslint.org/docs/rules/
+rules:
+  # Possible Errors
+  no-await-in-loop: off
+  no-cond-assign: error
+  no-console: off
+  no-constant-condition: error
+  no-control-regex: error
+  no-debugger: error
+  no-dupe-args: error
+  no-dupe-keys: error
+  no-duplicate-case: error
+  no-empty-character-class: error
+  no-empty: error
+  no-ex-assign: error
+  no-extra-boolean-cast: error
+  no-extra-parens: off
+  no-extra-semi: error
+  no-func-assign: error
+  no-inner-declarations:
+    - error
+    - functions
+  no-invalid-regexp: error
+  no-irregular-whitespace: error
+  no-negated-in-lhs: error
+  no-obj-calls: error
+  no-prototype-builtins: off
+  no-regex-spaces: error
+  no-sparse-arrays: error
+  no-template-curly-in-string: off
+  no-unexpected-multiline: error
+  no-unreachable: error
+  no-unsafe-finally: off
+  no-unsafe-negation: off
+  use-isnan: error
+  valid-jsdoc: off
+  valid-typeof: error
+
+  # Best Practices
+  accessor-pairs: error
+  array-callback-return: off
+  block-scoped-var: off
+  class-methods-use-this: off
+  complexity:
+    - error
+    - 6
+  consistent-return: off
+  curly: off
+  default-case: off
+  dot-location: off
+  dot-notation: off
+  eqeqeq: error
+  guard-for-in: error
+  no-alert: error
+  no-caller: error
+  no-case-declarations: error
+  no-div-regex: error
+  no-else-return: off
+  no-empty-function: off
+  no-empty-pattern: error
+  no-eq-null: error
+  no-eval: error
+  no-extend-native: error
+  no-extra-bind: error
+  no-extra-label: off
+  no-fallthrough: error
+  no-floating-decimal: off
+  no-global-assign: off
+  no-implicit-coercion: off
+  no-implied-eval: error
+  no-invalid-this: off
+  no-iterator: error
+  no-labels:
+    - error
+    - allowLoop: true
+      allowSwitch: true
+  no-lone-blocks: error
+  no-loop-func: error
+  no-magic-number: off
+  no-multi-spaces: off
+  no-multi-str: off
+  no-native-reassign: error
+  no-new-func: error
+  no-new-wrappers: error
+  no-new: error
+  no-octal-escape: error
+  no-octal: error
+  no-param-reassign: off
+  no-proto: error
+  no-redeclare: error
+  no-restricted-properties: off
+  no-return-assign: error
+  no-return-await: off
+  no-script-url: error
+  no-self-assign: off
+  no-self-compare: error
+  no-sequences: off
+  no-throw-literal: off
+  no-unmodified-loop-condition: off
+  no-unused-expressions: error
+  no-unused-labels: off
+  no-useless-call: error
+  no-useless-concat: error
+  no-useless-escape: off
+  no-useless-return: off
+  no-void: error
+  no-warning-comments: off
+  no-with: error
+  prefer-promise-reject-errors: off
+  radix: error
+  require-await: off
+  vars-on-top: off
+  wrap-iife: error
+  yoda: off
+
+  # Strict
+  strict: off
+
+  # Variables
+  init-declarations: off
+  no-catch-shadow: error
+  no-delete-var: error
+  no-label-var: error
+  no-restricted-globals: off
+  no-shadow-restricted-names: error
+  no-shadow: off
+  no-undef-init: error
+  no-undef: off
+  no-undefined: off
+  no-unused-vars: off
+  no-use-before-define: off
+
+  # Node.js and CommonJS
+  callback-return: error
+  global-require: error
+  handle-callback-err: error
+  no-mixed-requires: off
+  no-new-require: off
+  no-path-concat: error
+  no-process-env: off
+  no-process-exit: error
+  no-restricted-modules: off
+  no-sync: off
+
+  # Stylistic Issues
+  array-bracket-spacing: off
+  block-spacing: off
+  brace-style: off
+  camelcase: off
+  capitalized-comments: off
+  comma-dangle:
+    - error
+    - never
+  comma-spacing: off
+  comma-style: off
+  computed-property-spacing: off
+  consistent-this: off
+  eol-last: off
+  func-call-spacing: off
+  func-name-matching: off
+  func-names: off
+  func-style: off
+  id-length: off
+  id-match: off
+  indent: off
+  jsx-quotes: off
+  key-spacing: off
+  keyword-spacing: off
+  line-comment-position: off
+  linebreak-style: off
+  lines-around-comment: off
+  lines-around-directive: off
+  max-depth: off
+  max-len: off
+  max-nested-callbacks: off
+  max-params: off
+  max-statements-per-line: off
+  max-statements:
+    - error
+    - 30
+  multiline-ternary: off
+  new-cap: off
+  new-parens: off
+  newline-after-var: off
+  newline-before-return: off
+  newline-per-chained-call: off
+  no-array-constructor: off
+  no-bitwise: off
+  no-continue: off
+  no-inline-comments: off
+  no-lonely-if: off
+  no-mixed-operators: off
+  no-mixed-spaces-and-tabs: off
+  no-multi-assign: off
+  no-multiple-empty-lines: off
+  no-negated-condition: off
+  no-nested-ternary: off
+  no-new-object: off
+  no-plusplus: off
+  no-restricted-syntax: off
+  no-spaced-func: off
+  no-tabs: off
+  no-ternary: off
+  no-trailing-spaces: off
+  no-underscore-dangle: off
+  no-unneeded-ternary: off
+  object-curly-newline: off
+  object-curly-spacing: off
+  object-property-newline: off
+  one-var-declaration-per-line: off
+  one-var: off
+  operator-assignment: off
+  operator-linebreak: off
+  padded-blocks: off
+  quote-props: off
+  quotes: off
+  require-jsdoc: off
+  semi-spacing: off
+  semi: off
+  sort-keys: off
+  sort-vars: off
+  space-before-blocks: off
+  space-before-function-paren: off
+  space-in-parens: off
+  space-infix-ops: off
+  space-unary-ops: off
+  spaced-comment: off
+  template-tag-spacing: off
+  unicode-bom: off
+  wrap-regex: off
+
+  # ECMAScript 6
+  arrow-body-style: off
+  arrow-parens: off
+  arrow-spacing: off
+  constructor-super: off
+  generator-star-spacing: off
+  no-class-assign: off
+  no-confusing-arrow: off
+  no-const-assign: off
+  no-dupe-class-members: off
+  no-duplicate-imports: off
+  no-new-symbol: off
+  no-restricted-imports: off
+  no-this-before-super: off
+  no-useless-computed-key: off
+  no-useless-constructor: off
+  no-useless-rename: off
+  no-var: off
+  object-shorthand: off
+  prefer-arrow-callback: off
+  prefer-const: off
+  prefer-destructuring: off
+  prefer-numeric-literals: off
+  prefer-rest-params: off
+  prefer-reflect: off
+  prefer-spread: off
+  prefer-template: off
+  require-yield: off
+  rest-spread-spacing: off
+  sort-imports: off
+  symbol-description: off
+  template-curly-spacing: off
+  yield-star-spacing: off
diff --git a/coffeelint.json b/coffeelint.json
new file mode 100644
index 000000000..86422e323
--- /dev/null
+++ b/coffeelint.json
@@ -0,0 +1,129 @@
+{
+  "arrow_spacing": {
+    "level": "ignore"
+  },
+  "braces_spacing": {
+    "level": "ignore",
+    "spaces": 0,
+    "empty_object_spaces": 0
+  },
+  "camel_case_classes": {
+    "level": "error"
+  },
+  "coffeescript_error": {
+    "level": "error"
+  },
+  "colon_assignment_spacing": {
+    "level": "ignore",
+    "spacing": {
+      "left": 0,
+      "right": 0
+    }
+  },
+  "cyclomatic_complexity": {
+    "value": 10,
+    "level": "ignore"
+  },
+  "duplicate_key": {
+    "level": "error"
+  },
+  "empty_constructor_needs_parens": {
+    "level": "ignore"
+  },
+  "ensure_comprehensions": {
+    "level": "warn"
+  },
+  "eol_last": {
+    "level": "ignore"
+  },
+  "indentation": {
+    "value": 2,
+    "level": "error"
+  },
+  "line_endings": {
+    "level": "ignore",
+    "value": "unix"
+  },
+  "max_line_length": {
+    "value": 80,
+    "level": "error",
+    "limitComments": true
+  },
+  "missing_fat_arrows": {
+    "level": "ignore",
+    "is_strict": false
+  },
+  "newlines_after_classes": {
+    "value": 3,
+    "level": "ignore"
+  },
+  "no_backticks": {
+    "level": "error"
+  },
+  "no_debugger": {
+    "level": "warn",
+    "console": false
+  },
+  "no_empty_functions": {
+    "level": "ignore"
+  },
+  "no_empty_param_list": {
+    "level": "ignore"
+  },
+  "no_implicit_braces": {
+    "level": "ignore",
+    "strict": true
+  },
+  "no_implicit_parens": {
+    "strict": true,
+    "level": "ignore"
+  },
+  "no_interpolation_in_single_quotes": {
+    "level": "ignore"
+  },
+  "no_plusplus": {
+    "level": "ignore"
+  },
+  "no_stand_alone_at": {
+    "level": "ignore"
+  },
+  "no_tabs": {
+    "level": "error"
+  },
+  "no_this": {
+    "level": "ignore"
+  },
+  "no_throwing_strings": {
+    "level": "error"
+  },
+  "no_trailing_semicolons": {
+    "level": "error"
+  },
+  "no_trailing_whitespace": {
+    "level": "error",
+    "allowed_in_comments": false,
+    "allowed_in_empty_lines": true
+  },
+  "no_unnecessary_double_quotes": {
+    "level": "ignore"
+  },
+  "no_unnecessary_fat_arrows": {
+    "level": "warn"
+  },
+  "non_empty_constructor_needs_parens": {
+    "level": "ignore"
+  },
+  "prefer_english_operator": {
+    "level": "ignore",
+    "doubleNotLevel": "ignore"
+  },
+  "space_operators": {
+    "level": "ignore"
+  },
+  "spacing_after_comma": {
+    "level": "ignore"
+  },
+  "transform_messes_up_line_numbers": {
+    "level": "warn"
+  }
+}

From e7e3fa8ee28249a1e225f159fb963d72ff2e0bec Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 20:46:40 +0300
Subject: [PATCH 31/36] add badges, add travis codeclimate integration

---
 .travis.yml | 2 ++
 README.md   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4e6723544..bbf9797a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,8 @@ services:
   - postgresql
 addons:
   postgresql: "9.4"
+  code_climate:
+      repo_token: 2fd0ab95eab718206f6732fdbd7b650da1e228f8dd491ef2082bb59d8684a054
 branches:
   only:
     - master
diff --git a/README.md b/README.md
index 8ee6384a2..cf209e707 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 Domain Registry
 ===============
 [![Build Status](https://travis-ci.org/internetee/registry.svg?branch=master)](https://travis-ci.org/internetee/registry)
+[![Code Climate](https://codeclimate.com/github/internetee/registry/badges/gpa.svg)](https://codeclimate.com/github/internetee/registry)
+[![Issue Count](https://codeclimate.com/github/internetee/registry/badges/issue_count.svg)](https://codeclimate.com/github/internetee/registry)
 
 Full stack top-level domain (TLD) management.
 

From 6bc6e3f51d76c4273dc9ffe708bf77ec6031574d Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 21:08:27 +0300
Subject: [PATCH 32/36] simplecov and codeclimate-test-reporter

---
 .travis.yml         | 1 +
 Gemfile             | 7 ++++++-
 Gemfile.lock        | 5 ++++-
 spec/spec_helper.rb | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bbf9797a3..a24c35fb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ before_script:
   - "RAILS_ENV=test bundle exec rake db:migrate"
 script:
   - "RAILS_ENV=test bundle exec rspec"
+  - "CODECLIMATE_REPO_TOKEN=2fd0ab95eab718206f6732fdbd7b650da1e228f8dd491ef2082bb59d8684a054 codeclimate-test-reporter"
 services:
   - postgresql
 addons:
diff --git a/Gemfile b/Gemfile
index d570ed721..5f88cada2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -108,6 +108,9 @@ gem 'pdfkit', '0.6.2'
 # for datepicker
 gem 'jquery-ui-rails', '5.0.5'
 
+# codeclimate
+
+
 group :development do
   gem 'spring',                '1.3.6'
   gem 'spring-commands-rspec', '1.0.4'
@@ -135,7 +138,7 @@ group :development, :test do
   gem 'pry', '0.10.1'
 
   # code review
-  gem 'simplecov',     '0.10.0', require: false
+#  gem 'simplecov',     '0.10.0', require: false
   gem 'rubycritic',    '3.2.0'
   gem 'bullet',        '4.14.7' # for finding database optimizations
   gem 'bundler-audit',
@@ -161,4 +164,6 @@ group :test do
   gem 'database_cleaner'
   gem 'factory_girl_rails'
   gem 'webmock'
+  gem 'simplecov'
+  gem 'codeclimate-test-reporter', "~> 1.0.0"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index f49dab70d..24299fb8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -148,6 +148,8 @@ GEM
     cliver (0.3.2)
     codeclimate-engine-rb (0.4.0)
       virtus (~> 1.0)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
     coderay (1.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -573,6 +575,7 @@ DEPENDENCIES
   bundler-audit!
   cancancan (= 1.11.0)
   capybara (= 2.4.4)
+  codeclimate-test-reporter (~> 1.0.0)
   coderay (= 1.1.0)
   coffee-rails (= 4.1.0)
   countries
@@ -631,7 +634,7 @@ DEPENDENCIES
   sdoc (= 0.4.1)
   select2-rails (= 3.5.9.3)
   selectize-rails (= 0.12.1)
-  simplecov (= 0.10.0)
+  simplecov
   simpleidn (= 0.0.7)
   spring (= 1.3.6)
   spring-commands-rspec (= 1.0.4)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 68a2c0be1..0f9fd4e8d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,7 @@
 require 'webmock/rspec'
+require 'simplecov'
+SimpleCov.start
+
 
 RSpec.configure do |config|
   # https://github.com/rspec/rspec-rails/issues/1076

From fd5c8bea73531d9c00ef1a6b108ea3517d06bb53 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 21:29:52 +0300
Subject: [PATCH 33/36] fixme changes, add reek to codeclimate

---
 .codeclimate.yml | 7 +++++++
 .travis.yml      | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 99383daf4..871a1abe5 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -20,8 +20,15 @@ engines:
     enabled: true
   fixme:
     enabled: true
+    config:
+      strings:
+      - FIXME
+      - TODO
+      - HACK
   rubocop:
     enabled: true
+  reek:
+    enabled: true
 ratings:
   paths:
   - Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
index a24c35fb8..b49edd8e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@ before_script:
   - "RAILS_ENV=test bundle exec rake db:migrate"
 script:
   - "RAILS_ENV=test bundle exec rspec"
-  - "CODECLIMATE_REPO_TOKEN=2fd0ab95eab718206f6732fdbd7b650da1e228f8dd491ef2082bb59d8684a054 codeclimate-test-reporter"
+after_success:
+  - "bundle exec codeclimate-test-reporter"
 services:
   - postgresql
 addons:

From 710295621f8af5e22f6111262a781d7fa21321b2 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 21:38:25 +0300
Subject: [PATCH 34/36] unlock bundler-audit, change order of gems in test

---
 Gemfile      | 11 ++++-------
 Gemfile.lock | 14 ++++----------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5f88cada2..d20880d7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -138,12 +138,9 @@ group :development, :test do
   gem 'pry', '0.10.1'
 
   # code review
-#  gem 'simplecov',     '0.10.0', require: false
   gem 'rubycritic',    '3.2.0'
   gem 'bullet',        '4.14.7' # for finding database optimizations
-  gem 'bundler-audit',
-    github: 'rubysec/bundler-audit',
-    ref: 'f89ef7fae1090bbad825ea76812d56d72b417055' # for finding future vulnerable gems
+  gem 'bundler-audit'
   gem 'brakeman',      '3.6.1', require: false # for security audit'
   # tmp, otherwise conflics with breakman
   # gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d'
@@ -162,8 +159,8 @@ end
 
 group :test do
   gem 'database_cleaner'
-  gem 'factory_girl_rails'
-  gem 'webmock'
-  gem 'simplecov'
+  gem 'factory_girl_rails' 
   gem 'codeclimate-test-reporter', "~> 1.0.0"
+  gem 'simplecov'
+  gem 'webmock'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 24299fb8c..c314d836d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,15 +44,6 @@ GIT
       que (~> 0.6)
       rails (>= 4.0)
 
-GIT
-  remote: https://github.com/rubysec/bundler-audit.git
-  revision: f89ef7fae1090bbad825ea76812d56d72b417055
-  ref: f89ef7fae1090bbad825ea76812d56d72b417055
-  specs:
-    bundler-audit (0.4.0)
-      bundler (~> 1.2)
-      thor (~> 0.18)
-
 GIT
   remote: https://github.com/tarmotalu/digidoc_client.git
   revision: 1645e83a5a548addce383f75703b0275c5310c32
@@ -137,6 +128,9 @@ GEM
     bullet (4.14.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.9.0)
+    bundler-audit (0.5.0)
+      bundler (~> 1.2)
+      thor (~> 0.18)
     cancancan (1.11.0)
     capybara (2.4.4)
       mime-types (>= 1.16)
@@ -572,7 +566,7 @@ DEPENDENCIES
   bootstrap-sass (= 3.3.5.1)
   brakeman (= 3.6.1)
   bullet (= 4.14.7)
-  bundler-audit!
+  bundler-audit
   cancancan (= 1.11.0)
   capybara (= 2.4.4)
   codeclimate-test-reporter (~> 1.0.0)

From 606b2a65702da3640a69f5d2112506b480e33d9e Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@gj.ee>
Date: Sun, 9 Apr 2017 21:45:02 +0300
Subject: [PATCH 35/36] change order of gems to  conform to style guide

---
 Gemfile | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index d20880d7f..4d039cd92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,10 +8,11 @@ end if Bundler::VERSION < '2'
 source 'https://rubygems.org'
 
 # core
-gem 'rails',        '4.2.7.1' # when update, all initializers eis_custom files needs check/update
-gem 'iso8601',      '0.8.6' # for dates and times
-gem 'hashie-forbidden_attributes', '0.1.1'
+
 gem 'SyslogLogger', '2.0', require: 'syslog/logger'
+gem 'hashie-forbidden_attributes', '0.1.1'
+gem 'iso8601',      '0.8.6' # for dates and times
+gem 'rails',        '4.2.7.1' # when update, all initializers eis_custom files needs check/update
 gem 'rest-client'
 
 # load env
@@ -34,45 +35,46 @@ gem 'haml-rails', '0.9.0' # haml for views
 gem 'nokogiri', '1.7.1' # For XML parsing
 
 # style
-gem 'sass-rails',     '5.0.6'   # sass style
 gem 'bootstrap-sass', '3.3.5.1' # bootstrap style
+gem 'sass-rails',     '5.0.6'   # sass style
 
 # js
-gem 'uglifier',        '2.7.2'  # minifies js
+
 gem 'coffee-rails',    '4.1.0'  # coffeescript support
-gem 'turbolinks',      '2.5.3'  # faster page load
+gem 'uglifier',        '2.7.2'  # minifies js
 gem 'jquery-rails',    '4.0.4'  # jquery
+gem 'turbolinks',      '2.5.3'  # faster page load
 gem 'selectize-rails', '0.12.1' # include selectize.js for select
-gem 'therubyracer',    '0.12.2', platforms: :ruby
 gem 'jquery-validation-rails', '1.13.1' # validate on client side
+gem 'therubyracer',    '0.12.2', platforms: :ruby
 
 # view helpers
 gem 'kaminari',         '0.16.3'  # pagination
-gem 'nprogress-rails',  '0.1.6.7' # visual loader
-gem 'html5_validators', '1.2.2'   # model requements now automatically on html form
 gem 'coderay',          '1.1.0'   # xml console visualize
+gem 'html5_validators', '1.2.2'   # model requements now automatically on html form
+gem 'nprogress-rails',  '0.1.6.7' # visual loader
 gem 'select2-rails',    '3.5.9.3' # for autocomplete
 gem 'bootstrap-datepicker-rails', '1.3.1.1' # datepicker
 gem 'liquid',           '3.0.6'   # for email templates
 
 # rights
-gem 'devise',    '3.5.4'  # authenitcation
 gem 'cancancan', '1.11.0' # autharization
+gem 'devise',    '3.5.4'  # authenitcation
 
 # rest api
 gem 'grape',    '0.12.0'
 gem 'jbuilder', '2.2.16'  # json api
 
 # registry specfic
-gem 'simpleidn', '0.0.7' # For punycode
 gem 'isikukood' # for EE-id validation
+gem 'simpleidn', '0.0.7' # For punycode
 gem 'money-rails'
 
 # deploy
-gem 'whenever', '0.9.4', require: false
 gem 'data_migrate',
   github: 'internetee/data-migrate',
   ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81'
+gem 'whenever', '0.9.4', require: false
 
 # country listing
 gem 'countries', :require => 'countries/global'
@@ -81,7 +83,7 @@ gem 'countries', :require => 'countries/global'
 gem 'deep_cloneable', '2.1.1'
 
 # id + mid login
-#gem 'digidoc_client', '0.3.0'
+# gem 'digidoc_client', '0.3.0'
 gem 'digidoc_client',
     github: 'tarmotalu/digidoc_client',
     branch: 'master'
@@ -93,8 +95,8 @@ gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem)
 
 # que
 gem 'que',           '0.10.0'
-gem 'que-web',       '0.4.0'
 gem 'daemons-rails', '1.2.1'
+gem 'que-web',       '0.4.0'
 gem 'que_mailer',
     github: 'prehnRA/que-mailer',
     branch: 'master'
@@ -112,13 +114,13 @@ gem 'jquery-ui-rails', '5.0.5'
 
 
 group :development do
+  gem 'guard',                 '2.12.9' # run tests automatically
   gem 'spring',                '1.3.6'
   gem 'spring-commands-rspec', '1.0.4'
-  gem 'guard',                 '2.12.9' # run tests automatically
-  gem 'guard-rspec',           '4.5.2'
   gem 'guard-rails',           '0.7.1' # run EPP server automatically
-  gem 'rubocop',               '0.48.1'
+  gem 'guard-rspec',           '4.5.2'
   gem 'guard-rubocop',         '1.2.0'
+  gem 'rubocop',               '0.48.1'
 
   # deploy
   gem 'mina', '0.3.1' # for fast deployment
@@ -126,12 +128,12 @@ end
 
 group :development, :test do
   # test stack
-  gem 'rspec-rails',        '3.5.2'
   gem 'capybara',           '2.4.4'
-  gem 'phantomjs-binaries', '1.9.2.4'
-  gem 'poltergeist',        '1.6.0'  # We are using PhantomJS instead
-  gem 'phantomjs',          '1.9.8.0'
+  gem 'rspec-rails',        '3.5.2' 
   gem 'fabrication',        '2.13.2' # Replacement for fixtures
+  gem 'phantomjs-binaries', '1.9.2.4' 
+  gem 'phantomjs',          '1.9.8.0'
+  gem 'poltergeist',        '1.6.0'  # We are using PhantomJS instead
   gem 'launchy',            '2.4.3' # for opening browser automatically
 
   # debug

From 7a56d74f916a71f4bb03b0bded7d12df5055f907 Mon Sep 17 00:00:00 2001
From: Georg <teadur@users.noreply.github.com>
Date: Sun, 9 Apr 2017 22:18:09 +0300
Subject: [PATCH 36/36] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index cf209e707..9b2833fa2 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@ Domain Registry
 [![Build Status](https://travis-ci.org/internetee/registry.svg?branch=master)](https://travis-ci.org/internetee/registry)
 [![Code Climate](https://codeclimate.com/github/internetee/registry/badges/gpa.svg)](https://codeclimate.com/github/internetee/registry)
 [![Issue Count](https://codeclimate.com/github/internetee/registry/badges/issue_count.svg)](https://codeclimate.com/github/internetee/registry)
+[![Test Coverage](https://codeclimate.com/github/internetee/registry/badges/coverage.svg)](https://codeclimate.com/github/internetee/registry/coverage)
+[![Documentation Status](https://readthedocs.org/projects/eeregistry/badge/?version=latest)](http://docs.internet.ee/en/latest/?badge=latest)
 
 Full stack top-level domain (TLD) management.