MergeRequests services

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 12 insertions, 14 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 712d01626b5..444d6ab469b 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -50,17 +50,26 @@ class MergeRequest < ActiveRecord::Base
     end
 
     event :merge do
-      transition [:reopened, :opened] => :merged
+      transition [:reopened, :opened, :locked] => :merged
     end
 
     event :reopen do
       transition closed: :reopened
     end
 
+    event :lock do
+      transition [:reopened, :opened] => :locked
+    end
+
+    event :unlock do
+      transition locked: :reopened
+    end
+
     state :opened
     state :reopened
     state :closed
     state :merged
+    state :locked
   end
 
   state_machine :merge_status, initial: :unchecked do
@@ -136,19 +145,8 @@ class MergeRequest < ActiveRecord::Base
     self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
   end
 
-  def merge!(user_id)
-    self.author_id_of_changes = user_id
-    self.merge
-  end
-
   def automerge!(current_user, commit_message = nil)
-    if Gitlab::Satellite::MergeAction.new(current_user, self).merge!(commit_message)
-      self.merge!(current_user.id)
-      true
-    end
-  rescue
-    mark_as_unmergeable
-    false
+    MergeRequests::AutoMergeService.new.execute(self, current_user, commit_message)
   end
 
   def mr_and_commit_notes
diff --git a/app/models/project.rb b/app/models/project.rb
index 579644d1119..d9da2c377c8 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -350,7 +350,7 @@ class Project < ActiveRecord::Base
     # Close merge requests
     mrs = self.merge_requests.opened.where(target_branch: branch_name).to_a
     mrs = mrs.select(&:last_commit).select { |mr| c_ids.include?(mr.last_commit.id) }
-    mrs.each { |merge_request| merge_request.merge!(user.id) }
+    mrs.each { |merge_request| MergeRequests::MergeService.new.execute(merge_request, user, nil) }
 
     true
   end