Download as
Browse Code »

Commit db966364de38d896961abba74c20a69bd3d6361c

Authored by Dmitriy Zaporozhets
1 parent d84b0fa6
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

MergeRequest#automerge accepts custom message now. MergeRequest#merge_commit_mes… 

…sage generate default one

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 1 changed file with 10 additions and 2 deletions   Show diff stats
app/models/merge_request.rb
  Diff comments   View file @db96636
@@ -214,8 +214,8 @@ class MergeRequest &lt; ActiveRecord::Base @@ -214,8 +214,8 @@ class MergeRequest &lt; ActiveRecord::Base
214 self.merge 214 self.merge
215 end 215 end
216 216
217 - def automerge!(current_user)  
218 - if Gitlab::Satellite::MergeAction.new(current_user, self).merge! && self.unmerged_commits.empty? 217 + def automerge!(current_user, merge_commit_message = nil)
  218 + if Gitlab::Satellite::MergeAction.new(current_user, self).merge!(merge_commit_message) && self.unmerged_commits.empty?
219 self.merge!(current_user.id) 219 self.merge!(current_user.id)
220 true 220 true
221 end 221 end
@@ -319,6 +319,14 @@ class MergeRequest &lt; ActiveRecord::Base @@ -319,6 +319,14 @@ class MergeRequest &lt; ActiveRecord::Base
319 update_all(updated_at: Time.now) 319 update_all(updated_at: Time.now)
320 end 320 end
321 321
  322 + def merge_commit_message
  323 + message = "Merge branch '#{source_branch}' into '#{target_branch}'"
  324 + message << "\n\n"
  325 + message << title
  326 + message << "\n\n"
  327 + message << description
  328 + end
  329 +
322 private 330 private
323 331
324 def dump_commits(commits) 332 def dump_commits(commits)