diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-02 14:25:03 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-02 14:25:03 +0100 |
| commit | 05c9d882166710a26e27a7b79e7855db47ca43c0 (patch) | |
| tree | 116e4ff8c152a6c1c9ea43897da18954c4e4a025 | |
| parent | 3b03987a27f3b6b720251b02abfadc4e9ba06fe8 (diff) | |
| download | gitlab-ce-05c9d882166710a26e27a7b79e7855db47ca43c0.tar.gz | |
Only show manual merge instructions if current user can merge
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index c52d870f6e2..09b228b7c0c 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -34,8 +34,8 @@ = render "projects/merge_requests/show/how_to_merge" = render "projects/merge_requests/widget/show.html.haml" - - if @merge_request.open? && @merge_request.can_be_merged? - .light.append-bottom-20 + - if @merge_request.open? && @merge_request.source_branch_exists? && @merge_request.can_be_merged? && @merge_request.can_be_merged_by?(current_user) + .light.prepend-top-default You can also accept this merge request manually using the = succeed '.' do = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" |