Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42

1 files changed, 0 insertions, 36 deletions

diff --git a/app/services/merge_requests/merge_base_service.rb b/app/services/merge_requests/merge_base_service.rb
index fa0a4f808e2..0c8795cfd61 100644
--- a/app/services/merge_requests/merge_base_service.rb
+++ b/app/services/merge_requests/merge_base_service.rb
@@ -18,24 +18,8 @@ module MergeRequests
       # No-op
     end
 
-    def source
-      strong_memoize(:source) do
-        if merge_request.squash_on_merge?
-          squash_sha!
-        else
-          merge_request.diff_head_sha
-        end
-      end
-    end
-
     private
 
-    def check_source
-      unless source
-        raise_error('No source for merge')
-      end
-    end
-
     # Overridden in EE.
     def check_size_limit
       # No-op
@@ -53,26 +37,6 @@ module MergeRequests
     def handle_merge_error(*args)
       # No-op
     end
-
-    def commit_message
-      params[:commit_message] ||
-        merge_request.default_merge_commit_message(user: current_user)
-    end
-
-    def squash_sha!
-      squash_result = ::MergeRequests::SquashService.new(
-        merge_request: merge_request,
-        current_user: current_user,
-        commit_message: params[:squash_commit_message]
-      ).execute
-
-      case squash_result[:status]
-      when :success
-        squash_result[:squash_sha]
-      when :error
-        raise ::MergeRequests::MergeService::MergeError, squash_result[:message]
-      end
-    end
   end
 end