diff options
| author | miks <miks@cubesystems.lv> | 2012-09-10 16:47:31 +0300 |
|---|---|---|
| committer | miks <miks@cubesystems.lv> | 2012-09-10 16:47:31 +0300 |
| commit | 2e34a6d3c40a60ed689de5d7870fe663b1959e88 (patch) | |
| tree | d2c1d12930948c11e2c767e8688ee49ac8c79ea4 /app/models/merge_request.rb | |
| parent | fdb5c82c331e43dc5d0466d2a4c90ce3e649fc7b (diff) | |
| parent | 8674fba173e520a67d60e6b5289dcd1bd648d537 (diff) | |
| download | gitlab-ce-2e34a6d3c40a60ed689de5d7870fe663b1959e88.tar.gz | |
Merge branch 'master' into project_hooks_api
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 542817b0eea..2e457f72286 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -162,7 +162,7 @@ class MergeRequest < ActiveRecord::Base end def automerge!(current_user) - if Gitlab::Merge.new(self, current_user).merge + if Gitlab::Merge.new(self, current_user).merge && self.unmerged_commits.empty? self.merge!(current_user.id) true end |