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

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

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

View file

@ -19,7 +19,7 @@ module Project::HooksTrait
# Update code for merge requests
mrs = self.merge_requests.opened.find_all_by_branch(branch_name).all
mrs.each { |merge_request| merge_request.reload_code }
mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
# Close merge requests
mrs = self.merge_requests.opened.where(:target_branch => branch_name).all