Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq

1 files changed, 11 insertions, 2 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index e59aee8b445..da7aebd944f 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -214,8 +214,8 @@ class MergeRequest < ActiveRecord::Base
     self.merge
   end
 
-  def automerge!(current_user)
-    if Gitlab::Satellite::MergeAction.new(current_user, self).merge! && self.unmerged_commits.empty?
+  def automerge!(current_user, commit_message = nil)
+    if Gitlab::Satellite::MergeAction.new(current_user, self).merge!(commit_message) && self.unmerged_commits.empty?
       self.merge!(current_user.id)
       true
     end
@@ -319,6 +319,15 @@ class MergeRequest < ActiveRecord::Base
         update_all(updated_at: Time.now)
   end
 
+  def merge_commit_message
+    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
+    message << "\n\n"
+    message << title.to_s
+    message << "\n\n"
+    message << description.to_s
+    message
+  end
+
   private
 
   def dump_commits(commits)