Merge branch 'master' into registry-569

# Conflicts:
#	Gemfile

.rubocop.yml

@@ -1,124 +1 @@
-AllCops:
+inherit_from: .rubocop_todo.yml
-    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'
-    - 'db/api_log_schema.rb'
-    - 'db/migrate/*'
-    - 'db/data/*'
-    # epp support files until 'complexity issues' will be solved
-    - 'spec/support/epp.rb'
-    - 'spec/support/epp_contact_xml_builder.rb'
-    - 'vendor/bundle/**/*'
-    - 'lib/tasks/import.rake'
-
-Metrics/LineLength:
-  Max: 120 # default 80
-
-Metrics/MethodLength:
-  Max: 25 # default 10
-
-Metrics/ClassLength:
-  Max: 300
-
-Documentation:
-  Enabled: false
-
-Style/Semicolon:
-  AllowAsExpressionSeparator: true
-
-Style/AndOr:
-  Enabled: false
-
-Style/BracesAroundHashParameters:
-  Enabled: false
-
-Style/IndentHash:
-  Enabled: false
-
-# no need to worry about it
-Style/StringLiterals:
-  Enabled: false
-
-# a bit too annoying requirement, no big drawback yet dedected
-Style/TrailingWhitespace:
-  Enabled: false
-
-# a bit too annoying requirement, no big drawback yet dedected
-Style/TrailingBlankLines:
-  Enabled: false
-
-# allow == operator used in void context in specs
-Void:
-  Exclude:
-    - 'spec/**/*'
-
-# allow should == nil in spec
-Style/NilComparison:
-  Exclude:
-    - 'spec/**/*'
-
-# let's save  space in spec
-Style/AlignHash:
-  Exclude:
-    - 'spec/**/*'
-
-# No need to force reduce to use |a, e| as parameters.
-# Configuration parameters: Methods.
-Style/SingleLineBlockParams:
-  Enabled: false
-
-# allow prefix for models and controllers, 
-# otherwise we have to intent all body 4 spaces
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-# Allow to use Estonian terms/data in comments
-Style/AsciiComments:
-  Enabled: false
-
-# turn off comment intention check during development 
-# because NerdCommenter honors commented code intentions
-Style/CommentIndentation:
-  Enabled: false
-
-# It did not alayws suggested good format
-Style/AlignParameters:
-  Enabled: false
-
-# No need fancy style of numbers such as 1_000_000
-Style/NumericLiterals:
-  Enabled: false
-
-# Too often suggest wrong syntax in subarray, this should be fix in rubocop first
-Style/WordArray:
-  Enabled: false
-
-# Ok to use parallel assigment such as: var1, var2 = [], []
-Style/ParallelAssignment:
-  Enabled: false
-
-# not working perfectly or not important enough to care
-Style/EmptyLinesAroundBlockBody:
-  Enabled: false
-
-# The ABC size is a calculated magnitude, so this number can be a Fixnum or a Float.
-Metrics/AbcSize:
-  Max: 35
-
-# Very strange intention requirement, disabled for now
-Style/FirstParameterIndentation:
-  Enabled: false
-
-# old school regex // works fine
-Style/RegexpLiteral:
-  Enabled: false
-
-# annoying to maintain, small thing, no real problem
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: false

Gemfile

@@ -114,7 +114,7 @@ gem 'active_model-errors_details' # Backport from Rails 5, https://github.com/ra
 group :development do
   gem 'spring'
   gem 'spring-commands-rspec'
-  gem 'rubocop',               '0.48.1'
+  gem 'rubocop'
 
   # deploy
   gem 'mina', '0.3.1' # for fast deployment

Gemfile.lock

@@ -293,6 +293,7 @@ GEM
     nprogress-rails (0.1.6.7)
     open4 (1.3.4)
     orm_adapter (0.5.0)
+    parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     pdfkit (0.6.2)
@@ -354,7 +355,8 @@ GEM
       activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (12.0.0)
     ransack (1.5.1)
       actionpack (>= 3.0)
@@ -392,7 +394,8 @@ GEM
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    rubocop (0.48.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -466,7 +469,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.2.0)
+    unicode-display_width (1.3.0)
     unicode_utils (1.4.0)
     uniform_notifier (1.9.0)
     uuidtools (2.1.5)
@@ -560,7 +563,7 @@ DEPENDENCIES
   ransack (= 1.5.1)
   rest-client
   rspec-rails (~> 3.6)
-  rubocop (= 0.48.1)
+  rubocop
   sass-rails (= 5.0.6)
   sdoc (= 0.4.1)
   select2-rails (= 3.5.9.3)

app/views/registrant/whois/index.haml

@@ -1,10 +1,6 @@
 = render 'shared/title', name: t(:whois)
 
-- if ENV['restful_whois_url'].blank?
+.row
-  %p
-    Registrant configuration issue: missing restful_whois_url
-- else
-  .row
   .col-md-12{style: 'margin-bottom: -15px;'}
     = form_tag registrant_whois_path, class: 'form-horizontal', method: :get do
       .col-md-11
@@ -16,6 +12,6 @@
              
             %span.glyphicon.glyphicon-search
              
-  %hr
+%hr
-  - if @domain
+- if @domain
   %pre= @domain.body

config/application-example.yml

@@ -83,12 +83,6 @@ key_path: '/home/registry/registry/shared/ca/private/webclient.key.pem'
 epp_hostname: 'registry.gitlab.eu'
 repp_url: 'https://repp.gitlab.eu/repp/v1/'
 
-
-#
-# REGISTRANT configuration
-#
-restful_whois_url: 'https://restful-whois.example.com'
-
 #
 # Estonian Business Registry
 #