diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-12 13:52:36 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-12 13:52:36 -0500 |
| commit | 906de20f82f43dd81a82f56a689b1973a0c23080 (patch) | |
| tree | 31a03093b0d239b324bbcd20993f75713fa2ae56 | |
| parent | f2edb26a1e4b2587f6177af2232997bc2c6a902e (diff) | |
| download | gitlab-ce-906de20f82f43dd81a82f56a689b1973a0c23080.tar.gz | |
reverting _disscusion
| -rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index ed3628a36a3..bff3c3b283d 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -1,7 +1,8 @@ - content_for :note_actions do - if can?(current_user, :update_merge_request, @merge_request) - = link_to 'Close', merge_request_path(@merge_request, merge_request: {state_event: :close}, format: 'json'), data: {no_turbolinks: true}, method: :put, class: "btn btn-nr btn-grouped btn-close close-mr-link btn-comment js-note-target-close #{merge_request_button_visibility(@merge_request, true)}", title: "Close merge request" - = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen}, format: 'json'), data: {no_turbolinks: true}, method: :put, class: "btn btn-nr btn-grouped btn-reopen reopen-mr-link btn-comment js-note-target-reopen #{merge_request_button_visibility(@merge_request, false)}", title: "Reopen merge request" + - if @merge_request.open? + = link_to 'Close', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request" + - if @merge_request.closed? + = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request" -#notes - = render "projects/notes/notes_with_form" +#notes= render "projects/notes/notes_with_form" |