diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2015-12-18 16:03:39 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2015-12-18 16:03:39 +0000 |
| commit | a54bd0ff77fd31791208d1fd23e6169e0e72b331 (patch) | |
| tree | eb20918cd42d921aa091d7409468d49295b7904b /app | |
| parent | 08ddb8f7689ec0d50e6c28e90f5eb7ab107fd0d3 (diff) | |
| parent | 50798a90b6d883221f2a0e1c8357beb62620f63a (diff) | |
| download | gitlab-ce-a54bd0ff77fd31791208d1fd23e6169e0e72b331.tar.gz | |
Merge branch 'fix/mr-reopen-button-title' into 'master'
Fix merge-request-reopen button title
Closes #4069
See merge request !2147
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index acb207eb1d6..473124480ac 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -17,9 +17,9 @@ .issue-btn-group.pull-right - if can?(current_user, :update_merge_request, @merge_request) - if @merge_request.open? - = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request" - = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "btn btn-grouped issuable-edit", id: "edit_merge_request" do + = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: 'btn btn-grouped btn-close', title: 'Close merge request' + = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-grouped issuable-edit', id: 'edit_merge_request' do %i.fa.fa-pencil-square-o Edit - if @merge_request.closed? - = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request" + = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'btn btn-grouped btn-reopen reopen-mr-link', title: 'Reopen merge request' |