diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-13 18:40:22 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-13 18:40:22 +0300 |
| commit | 2356f9ab2560dcb54af71a806df75de6eea45b09 (patch) | |
| tree | 905f09e10648d98d811906fd36be0c373e0228ae /app/views | |
| parent | 9f5dfd59f147db5f27da6f73a4c1ca06293c21ae (diff) | |
| parent | 8fe96f4e50e8711e376d3ac33a04bced8f6d4f55 (diff) | |
Merge branch 'qa-auto-assign-codeowner-spec' into 'master'
Update merge request page object and selectors
See merge request gitlab-org/gitlab-ce!22939
Diffstat (limited to 'app/views')
| -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 |