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

Unverify MR on every push. Ajax for MR accept. better UI

Browse source
This commit is contained in:
randx 2012-03-30 08:15:04 +03:00
parent 411d84f385
commit 3824f9b372
5 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/merge_request.rb
View file

@ -64,6 +64,10 @@ class MergeRequest < ActiveRecord::Base
state == UNCHECKED
end
def mark_as_unchecked
self.update_attributes(:state => UNCHECKED)
end
def can_be_merged?
state == CAN_BE_MERGED
end
@ -170,7 +174,7 @@ class MergeRequest < ActiveRecord::Base
)
end
def automerge!
def automerge!(current_user)
if GitlabMerge.new(self).merge
self.merge!(current_user.id)
true