diff options
| author | Mark Lapierre <mlapierre@gitlab.com> | 2018-10-30 14:43:25 -0400 |
|---|---|---|
| committer | Mark Lapierre <mlapierre@gitlab.com> | 2018-11-09 11:53:49 -0500 |
| commit | 8fe96f4e50e8711e376d3ac33a04bced8f6d4f55 (patch) | |
| tree | 63db552eb9edcaa7c3a66337d385cf2ff832eb10 /app | |
| parent | 89494036f0db57a251df0b35b12e2d8b94f42b77 (diff) | |
| download | gitlab-ce-8fe96f4e50e8711e376d3ac33a04bced8f6d4f55.tar.gz | |
Update merge request page object and selectorsqa-auto-assign-codeowner-spec
These are changes from EE that are also relevant to CE from:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8372
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/_mr_title.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index 1bf42ded97a..3cd83feb842 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -37,6 +37,6 @@ = link_to 'Reopen', merge_request_path(@merge_request, merge_request: { state_event: :reopen }), method: :put, class: 'reopen-mr-link', title: 'Reopen merge request' - if can_update_merge_request - = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), class: "d-none d-sm-none d-md-block btn btn-grouped js-issuable-edit" + = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), class: "d-none d-sm-none d-md-block btn btn-grouped js-issuable-edit qa-edit-button" = render 'shared/issuable/close_reopen_button', issuable: @merge_request, can_update: can_update_merge_request, can_reopen: can_update_merge_request |