diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-20 15:25:48 +0200 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-20 15:25:48 +0200 |
| commit | 122769e358287c32777092f66eec2b67a501c386 (patch) | |
| tree | 7505998721903281693c2a3c8a6e63c39644b9d6 /app | |
| parent | 51ef5b929708d3ad90b6db6afbb78ee24eeb8aa1 (diff) | |
| download | gitlab-ce-122769e358287c32777092f66eec2b67a501c386.tar.gz | |
Refactor Gitlab::Merge
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index f4644dacc61..b17f689c54e 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -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 |