MERGE: merged staging at 3235647, resolved merge conflict

config/initializers/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def include_any? *args
+    (self & args).any?
+  end
+end

config/locales/en.yml

@@ -633,6 +633,7 @@ en:
   expiry_absolute: 'Expiry absolute'
   upload_key: 'Upload key'
   legal_document: 'Legal document'
+  legal_document_max_size: '(max. 8MB)'
   delete_domain: 'Delete domain'
   index: 'Index'
   ident: 'Ident'
@@ -921,3 +922,6 @@ en:
   force_delete_subject: 'Kustutusmenetluse teade'
   welcome_to_eis_registrar_portal: 'Welcome to EIS Registrar portal'
   interfaces: 'Interfaces'
+  list_format_is_in_yaml: 'List format is in YAML'
+  if_auth_info_is_left_empty_it_will_be_auto_generated: 'If auth info is left empty, it will be auto generated.'
+  each_domain_name_must_end_with_colon_sign: 'Each domain name must end with colon (:) sign.'

config/routes.rb

@@ -56,6 +56,7 @@ Rails.application.routes.draw do
         get 'info'
         get 'check'
         get 'delete'
+        get 'search_contacts'
       end
     end