diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-13 01:59:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-13 01:59:38 +0300 |
| commit | 734bfe3a2e8b86c3e049f6f13d380b3d30e4e359 (patch) | |
| tree | a0599c2a6efd4466ba7f48471def5791d2682e53 /app/views | |
| parent | 27e1dab1ed98c46c91b85e8c5dd1cefd62c0cb96 (diff) | |
Add latest changes from gitlab-org/security/gitlab@16-6-stable-ee
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/_nav_btns.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_nav_btns.html.haml b/app/views/projects/merge_requests/_nav_btns.html.haml index 2c0a8d831e4..4607aebf121 100644 --- a/app/views/projects/merge_requests/_nav_btns.html.haml +++ b/app/views/projects/merge_requests/_nav_btns.html.haml @@ -4,7 +4,7 @@ - if @can_bulk_update = render Pajamas::ButtonComponent.new(type: :submit, button_options: { class: 'gl-mr-3 js-bulk-update-toggle' }) do = _("Bulk edit") -- if merge_project +- if merge_project && can?(@current_user, :create_merge_request_in, @project) = render Pajamas::ButtonComponent.new(href: new_merge_request_path, variant: :confirm) do = _("New merge request") |