Merge branch 'master' into 62788-graphql-pagination62788-graphql-pagination

* master: (61 commits)
  Add dependency list documentation
  added code differences from EE to CE
  Remove metrics_time_window feature flag
  SSoT audit fixes
  Integrate demo link into content more
  Add styles and animations for onboarding helper
  Add git 2.21 install from update_source
  IDE trigger files change event
  Remove 'build-page' from 'ide-terminal' element
  Add section to dev docs on accessing chatops
  Fix OpenID Connect documentation
  Make OpenID Connect work without requiring a name
  Apply reviewer feedback
  Change text to match screencaps
  Reword for clarity
  Upgrade jira user permissions workflow docs
  Fix some typoes
  Removes duplicated shared_context folder
  Add frontend support for cluster health alerts
  Add changelog entry for sidekiq metrics
  ...

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