diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-20 19:11:38 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-20 19:11:38 +0000 |
| commit | 9a60887199ef1087285ea6997f2eb117f87d0a03 (patch) | |
| tree | b5a1dd3641e274cf13f1b2736cdd1cba9be91fcc | |
| parent | 9b007d869b435f1e59c9a66548de1dc9567a30c3 (diff) | |
| parent | c3b5c322b9bdd9e1299e412659b6cb14f39ee9d4 (diff) | |
| download | gitlab-ce-9a60887199ef1087285ea6997f2eb117f87d0a03.tar.gz | |
Merge branch 'remove-duplicate-ids' into 'master'
Removed duplicate ID's from the HTML
See merge request !3818
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 4 |
1 files changed, 2 insertions, 2 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 0a99e8c9591..36c275e8be1 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -24,9 +24,9 @@ %li{ class: issue_button_visibility(@merge_request, false) } = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'reopen-mr-link', title: 'Reopen merge request' %li - = link_to 'Edit', edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'issuable-edit', id: 'edit_merge_request' + = link_to 'Edit', edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'issuable-edit' = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-close #{issue_button_visibility(@merge_request, true)}", title: 'Close merge request' = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-reopen reopen-mr-link #{issue_button_visibility(@merge_request, false)}", title: 'Reopen merge request' - = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "hidden-xs hidden-sm btn btn-nr btn-grouped issuable-edit", id: 'edit_merge_request' do + = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "hidden-xs hidden-sm btn btn-nr btn-grouped issuable-edit" do = icon('pencil-square-o') Edit |