diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-03-07 13:39:41 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-03-07 19:00:50 +0300 |
| commit | cfa9d1ed6b870dbc635148219b42d73c382eb90a (patch) | |
| tree | aa7eeedfa4af657c518093aa776ff54f3f1197e3 /app/models/merge_request.rb | |
| parent | 558e9cd92bab44a0b323132b2f2e6a3bb6dcc738 (diff) | |
Only allow users that can merge to push to source
We only allow users that can merge the merge request to push to the
fork.
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 59fd2d4e4a0..c2bae379a94 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -865,7 +865,7 @@ class MergeRequest < ActiveRecord::Base def can_be_merged_by?(user) access = ::Gitlab::UserAccess.new(user, project: project) - access.can_push_to_branch?(target_branch) || access.can_merge_to_branch?(target_branch) + access.can_update_branch?(target_branch) end def can_be_merged_via_command_line_by?(user) |