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

Merge Button v1 complete

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-30 20:49:34 +03:00
parent 464cd59dff
commit 90748cf724
6 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/ability.rb
View file

@ -46,6 +46,7 @@ class Ability
:admin_team_member,
:admin_merge_request,
:admin_note,
:accept_mr,
:admin_wiki
] if project.master_access_for?(user) || project.owner == user

4
app/models/merge_request.rb
View file

@ -73,7 +73,7 @@ class MergeRequest < ActiveRecord::Base
end
def check_if_can_be_merged
self.state = if GitlabMerge.new(self).can_be_merged?
self.state = if GitlabMerge.new(self, self.author).can_be_merged?
CAN_BE_MERGED
else
CANNOT_BE_MERGED
@ -175,7 +175,7 @@ class MergeRequest < ActiveRecord::Base
end
def automerge!(current_user)
if GitlabMerge.new(self).merge
if GitlabMerge.new(self, current_user).merge
self.merge!(current_user.id)
true
end