Extract EE-specific code from Projects::Settings::IntegrationsController

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/controllers/projects/settings/integrations_controller.rb

 module Projects
   module Settings
     class IntegrationsController < Projects::ApplicationController
+      prepend EE::Projects::Settings::IntegrationsController
+
       include ServiceParams
 
       before_action :authorize_admin_project!
@@ -18,17 +20,7 @@ module Projects
 
       # Returns a list of services that should be hidden from the list
       def service_exceptions
-        exceptions = @project.disabled_services.dup
-
-        exceptions << slack_service
-      end
-
-      def slack_service
-        if Gitlab::CurrentSettings.slack_app_enabled
-          'slack_slash_commands'
-        else
-          'gitlab_slack_application'
-        end
+        @project.disabled_services.dup
       end
     end
   end

app/models/project.rb

@@ -1014,7 +1014,7 @@ class Project < ActiveRecord::Base
 
     available_services_names = Service.available_services_names - exceptions
 
-    available_services_names.map do |service_name|
+    available_services = available_services_names.map do |service_name|
       service = find_service(services, service_name)
 
       if service
@@ -1031,6 +1031,14 @@ class Project < ActiveRecord::Base
         end
       end
     end
+
+    available_services.reject do |service|
+      disabled_services.include?(service.to_param)
+    end
+  end
+
+  def disabled_services
+    []
   end
 
   def find_or_initialize_service(name)

ee/app/controllers/ee/projects/settings/integrations_controller.rb

+module EE
+  module Projects
+    module Settings
+      module IntegrationsController
+        extend ::Gitlab::Utils::Override
+
+        private
+
+        override :service_exceptions
+        def service_exceptions
+          super << slack_service
+        end
+
+        def slack_service
+          if ::Gitlab::CurrentSettings.slack_app_enabled
+            'slack_slash_commands'
+          else
+            'gitlab_slack_application'
+          end
+        end
+      end
+    end
+  end
+end

ee/app/models/ee/project.rb

@@ -448,15 +448,7 @@ module EE
       ).create
     end
 
-    # Override to reject disabled services
-    def find_or_initialize_services(exceptions: [])
-      available_services = super
-
-      available_services.reject do |service|
-        disabled_services.include?(service.to_param)
-      end
-    end
-
+    override :disabled_services
     def disabled_services
       strong_memoize(:disabled_services) do
         disabled_services = []