Commit 4f4ef544 authored by Florie Guibert's avatar Florie Guibert

Migrate to shared alert in MR title

No visual changes
parent 7aca51cc
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
= cache(cache_key, expires_in: 1.day) do = cache(cache_key, expires_in: 1.day) do
- if @merge_request.closed_or_merged_without_fork? - if @merge_request.closed_or_merged_without_fork?
.gl-alert.gl-alert-danger.gl-mb-5 = render 'shared/global_alert',
.gl-alert-container alert_class: 'gl-mb-5',
= sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') variant: :danger,
.gl-alert-content dismissible: false do
.gl-alert-body .gl-alert-body
The source project of this merge request has been removed. = _('The source project of this merge request has been removed.')
.detail-page-header.border-bottom-0.pt-0.pb-0 .detail-page-header.border-bottom-0.pt-0.pb-0
.detail-page-header-body .detail-page-header-body
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
%li= link_to _('Report abuse'), new_abuse_report_path(user_id: @merge_request.author.id, ref_url: merge_request_url(@merge_request)) %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 - if can_update_merge_request
= link_to _('Edit'), edit_project_merge_request_path(@project, @merge_request), class: "d-none d-md-block btn gl-button btn-default btn-grouped js-issuable-edit", data: { qa_selector: "edit_button" } = link_to _('Edit'), edit_project_merge_request_path(@project, @merge_request), class: "gl-display-none gl-md-display-block btn gl-button btn-default btn-grouped js-issuable-edit", data: { qa_selector: "edit_button" }
- if can_update_merge_request && !are_close_and_open_buttons_hidden - if can_update_merge_request && !are_close_and_open_buttons_hidden
= render 'projects/merge_requests/close_reopen_draft_report_toggle' = render 'projects/merge_requests/close_reopen_draft_report_toggle'
- elsif !@merge_request.merged? - elsif !@merge_request.merged?
= link_to _('Report abuse'), new_abuse_report_path(user_id: @merge_request.author.id, ref_url: merge_request_url(@merge_request)), class: 'gl-display-none gl-md-display-block gl-button btn btn-default float-right gl-ml-3', title: _('Report abuse') = link_to _('Report abuse'), new_abuse_report_path(user_id: @merge_request.author.id, ref_url: merge_request_url(@merge_request)), class: 'gl-display-none gl-md-display-block gl-button btn btn-default gl-float-right gl-ml-3', title: _('Report abuse')
...@@ -36903,6 +36903,9 @@ msgstr "" ...@@ -36903,6 +36903,9 @@ msgstr ""
msgid "The snippet is visible to any logged in user except external users." msgid "The snippet is visible to any logged in user except external users."
msgstr "" msgstr ""
msgid "The source project of this merge request has been removed."
msgstr ""
msgid "The specified tab is invalid, please select another" msgid "The specified tab is invalid, please select another"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment