Merge remote-tracking branch 'origin/105846070-merge-with-105842700-arireg-for-registrant-port' into staging

# Conflicts:
#	app/models/domain.rb

config/routes.rb

@@ -103,6 +103,12 @@ Rails.application.routes.draw do
   namespace :registrant do
     root 'domains#index'
 
+    resources :domains do
+      collection do
+        get :download_list
+      end
+    end
+
     # resources :invoices do
       # member do
         # get 'download_pdf'
@@ -141,6 +147,16 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :registrars do
+      resources :api_users
+      resources :white_ips
+      collection do
+        get :search
+      end
+    end
+
+    resources :registrants
+
     resources :whois
     # resources :contacts do
       # member do