Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 25 insertions, 23 deletions

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index ccb8b393bfe..74145a70b95 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
 class Projects::ServicesController < Projects::ApplicationController
-  include ServiceParams
+  include Integrations::Params
   include InternalRedirect
 
   # Authorize
   before_action :authorize_admin_project!
   before_action :ensure_service_enabled
-  before_action :service
+  before_action :integration
   before_action :web_hook_logs, only: [:edit, :update]
   before_action :set_deprecation_notice_for_prometheus_service, only: [:edit, :update]
   before_action :redirect_deprecated_prometheus_service, only: [:update]
-  before_action only: :edit do
-    push_frontend_feature_flag(:jira_for_vulnerabilities, @project, type: :development, default_enabled: :yaml)
-  end
 
   respond_to :html
 
@@ -22,20 +19,19 @@ class Projects::ServicesController < Projects::ApplicationController
   feature_category :integrations
 
   def edit
-    @default_integration = Service.default_integration(service.type, project)
+    @default_integration = Integration.default_integration(service.type, project)
   end
 
   def update
-    @service.attributes = service_params[:service]
-    @service.inherit_from_id = nil if service_params[:service][:inherit_from_id].blank?
+    @integration.attributes = integration_params[:integration]
+    @integration.inherit_from_id = nil if integration_params[:integration][:inherit_from_id].blank?
 
-    saved = @service.save(context: :manual_change)
+    saved = @integration.save(context: :manual_change)
 
     respond_to do |format|
       format.html do
         if saved
-          target_url = safe_redirect_path(params[:redirect_to]).presence || edit_project_service_path(@project, @service)
-          redirect_to target_url, notice: success_message
+          redirect_to redirect_path, notice: success_message
         else
           render 'edit'
         end
@@ -50,7 +46,7 @@ class Projects::ServicesController < Projects::ApplicationController
   end
 
   def test
-    if @service.can_test?
+    if integration.can_test?
       render json: service_test_response, status: :ok
     else
       render json: {}, status: :not_found
@@ -59,12 +55,16 @@ class Projects::ServicesController < Projects::ApplicationController
 
   private
 
+  def redirect_path
+    safe_redirect_path(params[:redirect_to]).presence || edit_project_service_path(@project, @integration)
+  end
+
   def service_test_response
-    unless @service.update(service_params[:service])
-      return { error: true, message: _('Validations failed.'), service_response: @service.errors.full_messages.join(','), test_failed: false }
+    unless @integration.update(integration_params[:integration])
+      return { error: true, message: _('Validations failed.'), service_response: @integration.errors.full_messages.join(','), test_failed: false }
     end
 
-    result = ::Integrations::Test::ProjectService.new(@service, current_user, params[:event]).execute
+    result = ::Integrations::Test::ProjectService.new(@integration, current_user, params[:event]).execute
 
     unless result[:success]
       return { error: true, message: s_('Integrations|Connection failed. Please check your settings.'), service_response: result[:message].to_s, test_failed: true }
@@ -76,16 +76,18 @@ class Projects::ServicesController < Projects::ApplicationController
   end
 
   def success_message
-    if @service.active?
-      s_('Integrations|%{integration} settings saved and active.') % { integration: @service.title }
+    if integration.active?
+      s_('Integrations|%{integration} settings saved and active.') % { integration: integration.title }
     else
-      s_('Integrations|%{integration} settings saved, but not active.') % { integration: @service.title }
+      s_('Integrations|%{integration} settings saved, but not active.') % { integration: integration.title }
     end
   end
 
-  def service
-    @service ||= @project.find_or_initialize_service(params[:id])
+  def integration
+    @integration ||= @project.find_or_initialize_service(params[:id])
+    @service ||= @integration # TODO: remove references to @service
   end
+  alias_method :service, :integration
 
   def web_hook_logs
     return unless @service.service_hook.present?
@@ -98,17 +100,17 @@ class Projects::ServicesController < Projects::ApplicationController
   end
 
   def serialize_as_json
-    @service
+    integration
       .as_json(only: @service.json_fields)
       .merge(errors: @service.errors.as_json)
   end
 
   def redirect_deprecated_prometheus_service
-    redirect_to edit_project_service_path(project, @service) if @service.is_a?(::PrometheusService) && Feature.enabled?(:settings_operations_prometheus_service, project)
+    redirect_to edit_project_service_path(project, integration) if integration.is_a?(::PrometheusService) && Feature.enabled?(:settings_operations_prometheus_service, project)
   end
 
   def set_deprecation_notice_for_prometheus_service
-    return if !@service.is_a?(::PrometheusService) || !Feature.enabled?(:settings_operations_prometheus_service, project)
+    return if !integration.is_a?(::PrometheusService) || !Feature.enabled?(:settings_operations_prometheus_service, project)
 
     operations_link_start = "<a href=\"#{project_settings_operations_path(project)}\">"
     message = s_('PrometheusService|You can now manage your Prometheus settings on the %{operations_link_start}Operations%{operations_link_end} page. Fields on this page has been deprecated.') % { operations_link_start: operations_link_start, operations_link_end: "</a>" }