From af7e75162efe07e9fcb1186462e56bd2325018de Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 4 Jul 2016 11:06:32 +0530
Subject: [PATCH] Don't ask the user to "merge this request manually".
1. If they are a developer with "Developers can Merge" switched on.
---
app/models/merge_request.rb | 5 +++++
.../projects/merge_requests/widget/open/_conflicts.html.haml | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
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.
--
GitLab