Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 8 insertions, 6 deletions

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index ca2a19e67b0..9a69ef991dd 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -20,7 +20,7 @@ class Projects::ServicesController < Projects::ApplicationController
   layout "project_settings"
 
   def edit
-    @admin_integration = Service.instance_for(service.type)
+    @default_integration = Service.default_integration(service.type, project)
   end
 
   def update
@@ -65,18 +65,20 @@ class Projects::ServicesController < Projects::ApplicationController
     result = ::Integrations::Test::ProjectService.new(@service, current_user, params[:event]).execute
 
     unless result[:success]
-      return { error: true, message: _('Test failed.'), service_response: result[:message].to_s, test_failed: true }
+      return { error: true, message: s_('Integrations|Connection failed. Please check your settings.'), service_response: result[:message].to_s, test_failed: true }
     end
 
     {}
   rescue Gitlab::HTTP::BlockedUrlError => e
-    { error: true, message: _('Test failed.'), service_response: e.message, test_failed: true }
+    { error: true, message: s_('Integrations|Connection failed. Please check your settings.'), service_response: e.message, test_failed: true }
   end
 
   def success_message
-    message = @service.active? ? _('activated') : _('settings saved, but not activated')
-
-    _('%{service_title} %{message}.') % { service_title: @service.title, message: message }
+    if @service.active?
+      s_('Integrations|%{integration} settings saved and active.') % { integration: @service.title }
+    else
+      s_('Integrations|%{integration} settings saved, but not active.') % { integration: @service.title }
+    end
   end
 
   def service