Merge branch 'master' into refactor-devise-integration

# Conflicts:
#	app/controllers/registrant/contacts_controller.rb
#	config/routes.rb

app/controllers/registrant/contacts_controller.rb

@@ -1,11 +1,14 @@
 class Registrant::ContactsController < RegistrantController
   helper_method :domain_ids
+
   def show
-    @contact      = Contact.where(id: contacts).find_by(id: params[:id])
+    @contact = Contact.where(id: contacts).find_by(id: params[:id])
 
     authorize! :read, @contact
   end
 
+  private
+
   def contacts
     begin
       DomainContact.where(domain_id: domain_ids).pluck(:contact_id) | Domain.where(id: domain_ids).pluck(:registrant_id)

app/controllers/registrant/domain_update_confirms_controller.rb

@@ -1,6 +1,6 @@
 class Registrant::DomainUpdateConfirmsController < RegistrantController
-  skip_before_action :authenticate_user!, only: [:show, :update]
-  skip_authorization_check only: [:show, :update]
+  skip_before_action :authenticate_user!, only: %i[show update]
+  skip_authorization_check only: %i[show update]
 
   def show
     return if params[:confirmed] || params[:rejected]

app/controllers/registrant/registrars_controller.rb

@@ -1,7 +1,6 @@
 class Registrant::RegistrarsController < RegistrantController
-
   def show
     @registrar = Registrar.find(params[:id])
     authorize! :read, @registrar
   end
-end
+end

app/controllers/registrar/nameservers_controller.rb

@@ -44,7 +44,10 @@ class Registrar
       parsed_response = JSON.parse(response.body, symbolize_names: true)
 
       if response.code == '200'
-        flash[:notice] = t '.replaced'
+        notices = [t('.replaced')]
+        notices << "#{t('.affected_domains')}: #{parsed_response[:affected_domains].join(', ')}"
+
+        flash[:notice] = notices
         redirect_to registrar_domains_url
       else
         @api_errors = parsed_response[:errors]