deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor Gitlab::Merge

Browse source 
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
This commit is contained in:
Riyad Preukschas 2012-10-20 15:25:48 +02:00
parent 51ef5b9297
commit 122769e358
2 changed files with 71 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/merge_request.rb
View file

@ -166,7 +166,7 @@ class MergeRequest < ActiveRecord::Base
end
def automerge!(current_user)
if Gitlab::Merge.new(self, current_user).merge && self.unmerged_commits.empty?
if Gitlab::Merge.new(self, current_user).merge! && self.unmerged_commits.empty?
self.merge!(current_user.id)
true
end