CE->EE: remove duplicated methods from automatic merge

app/models/project.rb

@@ -1621,34 +1621,6 @@ class Project < ActiveRecord::Base
     Gitlab::GlRepository.gl_repository(self, is_wiki)
   end
 
-  def merge_method
-    if self.merge_requests_ff_only_enabled
-      :ff
-    elsif self.merge_requests_rebase_enabled
-      :rebase_merge
-    else
-      :merge
-    end
-  end
-
-  def merge_method=(method)
-    case method.to_s
-    when "ff"
-      self.merge_requests_ff_only_enabled = true
-      self.merge_requests_rebase_enabled = true
-    when "rebase_merge"
-      self.merge_requests_ff_only_enabled = false
-      self.merge_requests_rebase_enabled = true
-    when "merge"
-      self.merge_requests_ff_only_enabled = false
-      self.merge_requests_rebase_enabled = false
-    end
-  end
-
-  def ff_merge_must_be_possible?
-    self.merge_requests_ff_only_enabled || self.merge_requests_rebase_enabled
-  end
-
   private
 
   def storage

app/models/repository.rb

@@ -848,25 +848,6 @@ class Repository
     end
   end
 
-  def ff_merge(user, source, target_branch, merge_request: nil)
-    our_commit = rugged.branches[target_branch].target
-    their_commit =
-      if source.is_a?(Gitlab::Git::Commit)
-        source.raw_commit
-      else
-        rugged.lookup(source)
-      end
-
-    raise 'Invalid merge target' if our_commit.nil?
-    raise 'Invalid merge source' if their_commit.nil?
-
-    with_branch(user, target_branch) do |start_commit|
-      merge_request&.update(in_progress_merge_commit_sha: their_commit.oid)
-
-      their_commit.oid
-    end
-  end
-
   def merge(user, source_sha, merge_request, message)
     with_cache_hooks do
       raw_repository.merge(user, source_sha, merge_request.target_branch, message) do |commit_id|