Merge branch '6021-extract-ee-services' into 'master'

Resolve "Extract EE specific files/lines for some service objects"

Closes #6021

See merge request gitlab-org/gitlab-ee!5796

app/services/application_settings/update_service.rb

 module ApplicationSettings
   class UpdateService < ApplicationSettings::BaseService
-    def execute
-      # Repository size limit comes as MB from the view
-      limit = @params.delete(:repository_size_limit)
-      @application_setting.repository_size_limit = Gitlab::Utils.try_megabytes_to_bytes(limit) if limit
+    prepend EE::ApplicationSettings::UpdateService
+
+    attr_reader :params, :application_setting
 
+    def execute
       update_terms(@params.delete(:terms))
 
       if params.key?(:performance_bar_allowed_group_path)

app/services/applications/create_service.rb

@@ -4,7 +4,7 @@ module Applications
 
     def initialize(current_user, params)
       @current_user = current_user
-      @params = params
+      @params = params.except(:ip_address)
     end
 
     def execute(request = nil)

app/services/commits/create_service.rb

 module Commits
   class CreateService < ::BaseService
+    prepend EE::Commits::CreateService
+
     ValidationError = Class.new(StandardError)
     ChangeError = Class.new(StandardError)
 
@@ -37,7 +39,6 @@ module Commits
 
     def validate!
       validate_permissions!
-      validate_repository_size!
       validate_on_branch!
       validate_branch_existance!
 
@@ -52,12 +53,6 @@ module Commits
       end
     end
 
-    def validate_repository_size!
-      if project.above_size_limit?
-        raise_error(Gitlab::RepositorySizeError.new(project).commit_error)
-      end
-    end
-
     def validate_on_branch!
       if !@start_project.empty_repo? && !@start_project.repository.branch_exists?(@start_branch)
         raise_error('You can only create or edit files when you are on a branch')

ee/app/services/ee/application_settings/update_service.rb

+module EE
+  module ApplicationSettings
+    module UpdateService
+      extend ::Gitlab::Utils::Override
+      extend ActiveSupport::Concern
+
+      override :execute
+      def execute
+        # Repository size limit comes as MB from the view
+        limit = params.delete(:repository_size_limit)
+        application_setting.repository_size_limit = ::Gitlab::Utils.try_megabytes_to_bytes(limit) if limit
+
+        super
+      end
+    end
+  end
+end

ee/app/services/ee/commits/create_service.rb

+module EE
+  module Commits
+    module CreateService
+      extend ::Gitlab::Utils::Override
+
+      private
+
+      override :validate!
+      def validate!
+        super
+
+        validate_repository_size!
+      end
+
+      def validate_repository_size!
+        if project.above_size_limit?
+          raise_error(Gitlab::RepositorySizeError.new(project).commit_error)
+        end
+      end
+    end
+  end
+end