Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/merge_requests/ff_merge_service.rb')
-rw-r--r--app/services/merge_requests/ff_merge_service.rb31
1 files changed, 0 insertions, 31 deletions
diff --git a/app/services/merge_requests/ff_merge_service.rb b/app/services/merge_requests/ff_merge_service.rb
deleted file mode 100644
index 1a83bbf9de6..00000000000
--- a/app/services/merge_requests/ff_merge_service.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module MergeRequests
- # MergeService class
- #
- # Do git fast-forward merge and in case of success
- # mark merge request as merged and execute all hooks and notifications
- # Executed when you do fast-forward merge via GitLab UI
- #
- class FfMergeService < MergeRequests::MergeService
- extend ::Gitlab::Utils::Override
-
- private
-
- override :execute_git_merge
- def execute_git_merge
- repository.ff_merge(
- current_user,
- source,
- merge_request.target_branch,
- merge_request: merge_request
- )
- end
-
- override :merge_success_data
- def merge_success_data(commit_id)
- # There is no merge commit to update, so this is just blank.
- {}
- end
- end
-end