Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4f4ef544
Commit
4f4ef544
authored
Mar 08, 2022
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate to shared alert in MR title
No visual changes
parent
7aca51cc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
app/views/projects/merge_requests/_mr_title.html.haml
app/views/projects/merge_requests/_mr_title.html.haml
+8
-8
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/views/projects/merge_requests/_mr_title.html.haml
View file @
4f4ef544
...
...
@@ -6,12 +6,12 @@
=
cache
(
cache_key
,
expires_in:
1
.
day
)
do
-
if
@merge_request
.
closed_or_merged_without_fork?
.gl-alert.gl-alert-danger.gl-mb-5
.gl-alert-container
=
sprite_icon
(
'error'
,
size:
16
,
css_class:
'gl-icon gl-alert-icon gl-alert-icon-no-title'
)
.gl-alert-content
=
render
'shared/global_alert'
,
alert_class:
'gl-mb-5'
,
variant: :danger
,
dismissible:
false
do
.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-body
...
...
@@ -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
))
-
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
=
render
'projects/merge_requests/close_reopen_draft_report_toggle'
-
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'
)
locale/gitlab.pot
View file @
4f4ef544
...
...
@@ -36903,6 +36903,9 @@ msgstr ""
msgid "The snippet is visible to any logged in user except external users."
msgstr ""
msgid "The source project of this merge request has been removed."
msgstr ""
msgid "The specified tab is invalid, please select another"
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment