Skip to content
Snippets Groups Projects
Verified Commit 110585c5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Hide mr close button for comment form if merge request was closed or inline comment

parent b7072ff0
Branches
Tags
No related merge requests found
Loading
@@ -89,3 +89,8 @@
Loading
@@ -89,3 +89,8 @@
.merge-request-form-info { .merge-request-form-info {
padding-top: 15px; padding-top: 15px;
} }
// hide mr close link for inline diff comment form
.diff-file .close-mr-link {
display: none;
}
Loading
@@ -24,8 +24,8 @@
Loading
@@ -24,8 +24,8 @@
   
- content_for :note_actions do - content_for :note_actions do
- if can?(current_user, :modify_merge_request, @merge_request) - if can?(current_user, :modify_merge_request, @merge_request)
- unless @merge_request.closed? - unless @merge_request.closed? || @merge_request.merged?
= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request" = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close close-mr-link", title: "Close merge request"
   
   
.notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" } .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment