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:
authorShinya Maeda <shinya@gitlab.com>2019-06-04 10:11:03 +0300
committerShinya Maeda <shinya@gitlab.com>2019-06-06 06:36:02 +0300
commit2a01b33e6ac27e84d842f3040d7adf799f7cf258 (patch)
treef980f35590423a378cec3ab65a68d303ffe751ac /app/models
parent1bec362138bfcf6343a9cbc951ef5c8c07d2baaa (diff)
Create BaseService for Auto Merge architecture
It abstracts some codes for common methods in AutoMerge::*Services.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/merge_request.rb15
1 files changed, 0 insertions, 15 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 59416fb4b51..4fcaac75655 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -984,21 +984,6 @@ class MergeRequest < ApplicationRecord
end
end
- def reset_auto_merge
- return unless auto_merge_enabled?
-
- self.auto_merge_enabled = false
- self.merge_user = nil
- if merge_params
- merge_params.delete('should_remove_source_branch')
- merge_params.delete('commit_message')
- merge_params.delete('squash_commit_message')
- merge_params.delete('auto_merge_strategy')
- end
-
- self.save
- end
-
# Return array of possible target branches
# depends on target project of MR
def target_branches