diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-09-04 14:22:26 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-09-04 14:22:26 +0000 |
| commit | 383dfd17622dd434940c858a57691d5306fc0607 (patch) | |
| tree | c61cd257137d9583dea4bed6e2fc915e8f5e48b3 /app/views/projects/merge_requests | |
| parent | ec9bb1a7deed082ef050a7275df0abd134f526f3 (diff) | |
| parent | d729ea19dac6a5d3ae4073a4050eda7b1215fd75 (diff) | |
| download | gitlab-ce-383dfd17622dd434940c858a57691d5306fc0607.tar.gz | |
Merge branch '39665-restrict-issue-reopen' into 'master'
Restrict reopening locked issues for non authorized issue authors
Closes #39665
See merge request gitlab-org/gitlab-ce!21299
Diffstat (limited to 'app/views/projects/merge_requests')
| -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 a58179091ae..1bf42ded97a 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -39,4 +39,4 @@ - 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" - = render 'shared/issuable/close_reopen_button', issuable: @merge_request, can_update: can_update_merge_request + = render 'shared/issuable/close_reopen_button', issuable: @merge_request, can_update: can_update_merge_request, can_reopen: can_update_merge_request |