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
7bb5f18a
Commit
7bb5f18a
authored
Mar 15, 2022
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate invalid merge request alert to global_alert partial
Closes
https://gitlab.com/gitlab-org/gitlab/-/issues/325374
parent
468127f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
13 deletions
+12
-13
app/views/projects/merge_requests/invalid.html.haml
app/views/projects/merge_requests/invalid.html.haml
+12
-13
No files found.
app/views/projects/merge_requests/invalid.html.haml
View file @
7bb5f18a
...
...
@@ -9,16 +9,15 @@
=
render
"projects/merge_requests/mr_title"
=
render
"projects/merge_requests/mr_box"
.gl-alert.gl-alert-danger
.gl-alert-container
=
sprite_icon
(
'error'
,
size:
16
,
css_class:
'gl-icon gl-alert-icon gl-alert-icon-no-title'
)
.gl-alert-content
{
role:
'alert'
}
.gl-alert-body
-
if
@merge_request
.
for_fork?
&&
!
@merge_request
.
source_project
=
err_fork_project_removed
-
elsif
!
@merge_request
.
source_branch_exists?
=
err_source_branch
.
html_safe
%
{
branch_badge:
gl_badge_tag
(
@merge_request
.
source_branch
,
variant: :info
,
size: :sm
),
path_badge:
gl_badge_tag
(
@merge_request
.
source_project_path
,
variant: :info
,
size: :sm
)
}
-
elsif
!
@merge_request
.
target_branch_exists?
=
err_target_branch
.
html_safe
%
{
branch_badge:
gl_badge_tag
(
@merge_request
.
target_branch
,
variant: :info
,
size: :sm
),
path_badge:
gl_badge_tag
(
@merge_request
.
source_project_path
,
variant: :info
,
size: :sm
)
}
-
else
=
err_internal
=
render
'shared/global_alert'
,
variant: :danger
,
dismissible:
false
do
.gl-alert-body
-
if
@merge_request
.
for_fork?
&&
!
@merge_request
.
source_project
=
err_fork_project_removed
-
elsif
!
@merge_request
.
source_branch_exists?
=
err_source_branch
.
html_safe
%
{
branch_badge:
gl_badge_tag
(
@merge_request
.
source_branch
,
variant: :info
,
size: :sm
),
path_badge:
gl_badge_tag
(
@merge_request
.
source_project_path
,
variant: :info
,
size: :sm
)
}
-
elsif
!
@merge_request
.
target_branch_exists?
=
err_target_branch
.
html_safe
%
{
branch_badge:
gl_badge_tag
(
@merge_request
.
target_branch
,
variant: :info
,
size: :sm
),
path_badge:
gl_badge_tag
(
@merge_request
.
source_project_path
,
variant: :info
,
size: :sm
)
}
-
else
=
err_internal
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