diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-07-04 11:06:32 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-07-13 13:24:56 +0530 |
| commit | af7e75162efe07e9fcb1186462e56bd2325018de (patch) | |
| tree | 169c65f72de7173516c3eafb8c20f5db13ae6d58 | |
| parent | 959d63ab1a5559f5f60ba7378a59e2d0fdb17c73 (diff) | |
| download | gitlab-ce-af7e75162efe07e9fcb1186462e56bd2325018de.tar.gz | |
Don't ask the user to "merge this request manually".
1. If they are a developer with "Developers can Merge" switched on.
| -rw-r--r-- | app/models/merge_request.rb | 5 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index e5853bdd589..471e32f3b60 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -556,6 +556,11 @@ class MergeRequest < ActiveRecord::Base access.can_push_to_branch?(target_branch) || access.can_merge_to_branch?(target_branch) end + def can_be_merged_via_command_line_by?(user) + access = ::Gitlab::UserAccess.new(user, project: project) + access.can_push_to_branch?(target_branch) + end + def mergeable_ci_state? return true unless project.only_allow_merge_if_build_succeeds? diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml index 06ab0a3fa00..f000cc38a65 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -4,7 +4,7 @@ %p Please resolve these conflicts or - - if @merge_request.can_be_merged_by?(current_user) + - if @merge_request.can_be_merged_via_command_line_by?(current_user) #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}. - else ask someone with write access to this repository to merge this request manually. |