diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-30 20:49:34 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-30 20:49:34 +0300 |
| commit | 90748cf724d4b019c954d316621b04cefd69dbaf (patch) | |
| tree | 6e6ac8345aec69abd1e38b259a1735ba7d28aa9d /app/models/merge_request.rb | |
| parent | 464cd59dff0e543cc367c0d468a70ca590334e42 (diff) | |
| download | gitlab-ce-90748cf724d4b019c954d316621b04cefd69dbaf.tar.gz | |
Merge Button v1 complete
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 85492e802e3..d7863c2edb0 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -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 |