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

Prepared for gitolite v3

Browse source
This commit is contained in:
randx 2012-08-29 02:03:04 +03:00
parent 1f5e2658f5
commit ad3a88cfd3
5 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/merge_request.rb
View file

@ -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

2
app/roles/push_event.rb
View file

@ -90,6 +90,8 @@ module PushEvent
def push_with_commits?
md_ref? && commits.any? && parent_commit && last_commit
rescue Grit::NoSuchPathError
false
end
def last_push_to_non_root?