diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-07 19:42:09 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-07 16:57:00 +0300 |
| commit | fa82736cf4ba55c0f549f137afd2abe8383e33f8 (patch) | |
| tree | 3e228b555bc7e19c305964198703986d1efe79e3 /app/views/projects/merge_requests/_mr_title.html.haml | |
| parent | e5100c3316f21c2fd49106b7eaa439ea44c1f36b (diff) | |
First UX review changes
Diffstat (limited to 'app/views/projects/merge_requests/_mr_title.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_mr_title.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index 834952353c4..eeb5eafd17a 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -25,14 +25,13 @@ .dropdown-menu.dropdown-menu-align-right.hidden-lg %ul - if can_update_merge_request + %li= link_to 'Edit', edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'issuable-edit' + %li= link_to 'Report abuse', new_abuse_report_path(user_id: @merge_request.author.id, ref_url: merge_request_url(@merge_request)) + - if can_update_merge_request %li{ class: merge_request_button_visibility(@merge_request, true) } = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, title: 'Close merge request' %li{ class: merge_request_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_project_merge_request_path(@project, @merge_request), class: 'issuable-edit' - %li - = link_to 'Report abuse', new_abuse_report_path(user_id: @merge_request.author.id, ref_url: merge_request_url(@merge_request)) - if can_update_merge_request = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), class: "hidden-xs hidden-sm btn btn-grouped issuable-edit" |