diff options
| author | Mathias Vestergaard <mathias.vestergaard@gmail.com> | 2016-05-20 01:58:34 +0200 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-07-13 13:24:26 +0530 |
| commit | f0577d838544152f558411ef1101d56c5852d92e (patch) | |
| tree | 5c2a60db094b4cf570e90bd97db0219cdd353ef5 /app/models/merge_request.rb | |
| parent | ecd301ddf618488a2b54827b44f9017f89b3d27d (diff) | |
| download | gitlab-ce-f0577d838544152f558411ef1101d56c5852d92e.tar.gz | |
Added "developers can merge" setting to protected branches
- Cherry-picked from `mvestergaard:branch-protection-dev-merge`
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 157901378d3..23d68706527 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -552,7 +552,8 @@ class MergeRequest < ActiveRecord::Base end def can_be_merged_by?(user) - ::Gitlab::GitAccess.new(user, project, 'web').can_push_to_branch?(target_branch) + access = ::Gitlab::GitAccess.new(user, project, 'web') + access.can_push_to_branch?(target_branch) || access.can_merge_to_branch?(target_branch) end def mergeable_ci_state? |