From 2a01b33e6ac27e84d842f3040d7adf799f7cf258 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Tue, 4 Jun 2019 14:11:03 +0700 Subject: Create BaseService for Auto Merge architecture It abstracts some codes for common methods in AutoMerge::*Services. --- app/models/merge_request.rb | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'app/models') 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 -- cgit v1.2.3