diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-23 12:55:43 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-23 12:55:43 +0200 |
| commit | 380342784d3efbecb98de81c9b2679e3d720f7c9 (patch) | |
| tree | 19be027f48dc182440ab20b70ed5c0021119c364 /app/models/merge_request.rb | |
| parent | cee68dec8a9b9531690da0f81fbe1ebdc31a7eea (diff) | |
| download | gitlab-ce-380342784d3efbecb98de81c9b2679e3d720f7c9.tar.gz | |
Fix MR spinach tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/merge_request.rb')
| -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 c53b24b817d..712d01626b5 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -142,7 +142,7 @@ class MergeRequest < ActiveRecord::Base end def automerge!(current_user, commit_message = nil) - if Gitlab::Satellite::MergeAction.new(current_user, self).merge!(commit_message) && self.unmerged_commits.empty? + if Gitlab::Satellite::MergeAction.new(current_user, self).merge!(commit_message) self.merge!(current_user.id) true end |