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

.rubocop.yml

@@ -72,3 +72,8 @@ Style/ClassAndModuleChildren:
 # 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

app/controllers/epp/contacts_controller.rb

@@ -46,7 +46,7 @@ class Epp::ContactsController < EppController
     @disclosure_policy = @contact.disclosure.try(:attributes_with_flag)
     @owner = owner?(false)
     # need to reload contact eagerly
-    @contact = find_contact('with eager load') if @owner # for clarity, could just be true
+    @contact = find_contact if @owner # for clarity, could just be true
     render_epp_response 'epp/contacts/info'
   end
 
@@ -114,7 +114,7 @@ class Epp::ContactsController < EppController
 
   ## SHARED
 
-  def find_contact(eager_load = nil)
+  def find_contact
     contact = Contact.find_by(code: @ph[:id])
     unless contact
       epp_errors << { code: '2303',

app/models/domain.rb

@@ -301,6 +301,7 @@ class Domain < ActiveRecord::Base
     log
   end
 
+  # rubocop:disable Metrics/MethodLength
   def update_whois_body
     self.whois_body = <<-EOS
       This Whois Server contains information on
@@ -335,6 +336,7 @@ class Domain < ActiveRecord::Base
       changed:
     EOS
   end
+  # rubocop:enabled Metrics/MethodLength
 
   def whois_server_update(name, whois_body)
     wd = Whois::Domain.find_or_initialize_by(name: name)