Merge branch 'master' into registry-849

lib/core_ext/array.rb

@@ -2,4 +2,4 @@ class Array
   def include_any?(*args)
     (self & args).any?
   end
-end
+end

lib/gem_ext/builder.rb

@@ -1,12 +1,14 @@
-class Builder::XmlMarkup
-  def epp_head
-    instruct!
-    epp(
-      'xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd',
-      'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-      'xsi:schemaLocation' => 'lib/schemas/epp-ee-1.0.xsd'
-    ) do
-      yield
+module Builder
+  class XmlMarkup
+    def epp_head
+      instruct!
+      epp(
+        'xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd',
+        'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+        'xsi:schemaLocation' => 'lib/schemas/epp-ee-1.0.xsd'
+      ) do
+        yield
+      end
     end
   end
 end

lib/gem_ext/paper_trail.rb

@@ -8,7 +8,7 @@ end
 # Store console and rake changes in versions
 if defined?(::Rails::Console) || File.basename($PROGRAM_NAME).split(' ').first == 'spring'
   PaperTrail.whodunnit = "console-#{`whoami`.strip}"
-elsif File.basename($PROGRAM_NAME) == "rake"
+elsif File.basename($PROGRAM_NAME) == 'rake'
   # rake username does not work when spring enabled
   PaperTrail.whodunnit = "rake-#{`whoami`.strip} #{ARGV.join ' '}"
 end

lib/tasks/import.rake

@@ -1,5 +1,3 @@
-# rubocop: disable Style/SymbolProc
-# rubocop: disable Performance/Detect
 namespace :import do
   # README
   #
@@ -360,7 +358,6 @@ namespace :import do
       legacy_contact_id
     )
 
-    # rubocop: disable Lint/UselessAssignment
     domain_status_columns = %w(
       description
       value
@@ -368,7 +365,6 @@ namespace :import do
       updator_str
       legacy_domain_id
     )
-    # rubocop: enable Lint/UselessAssignment
 
     nameserver_columns = %w(
       hostname
@@ -786,5 +782,3 @@ def parse_zone_ns_data(domain, zone)
   end
   [ns_records.strip, a_records.strip, a4_records.strip]
 end
-# rubocop: enable Performance/Detect
-# rubocop: enable Style/SymbolProc