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
91f07e9b
Commit
91f07e9b
authored
Jul 16, 2020
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-exclamation-triangle in MR listing page
With `warning-solid` from GitLab SVG
parent
e8771823
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
No files found.
app/views/projects/merge_requests/_merge_request.html.haml
View file @
91f07e9b
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
-
if
merge_request
.
open?
&&
merge_request
.
broken?
-
if
merge_request
.
open?
&&
merge_request
.
broken?
%li
.issuable-pipeline-broken.d-none.d-sm-flex
%li
.issuable-pipeline-broken.d-none.d-sm-flex
=
link_to
merge_request_path
(
merge_request
),
class:
"has-tooltip"
,
title:
_
(
'Cannot be merged automatically'
)
do
=
link_to
merge_request_path
(
merge_request
),
class:
"has-tooltip"
,
title:
_
(
'Cannot be merged automatically'
)
do
=
icon
(
'exclamation-triangle'
)
=
sprite_icon
(
'warning-solid'
,
size:
16
)
-
if
merge_request
.
assignees
.
any?
-
if
merge_request
.
assignees
.
any?
%li
.d-flex
%li
.d-flex
=
render
'shared/issuable/assignees'
,
project:
merge_request
.
project
,
issuable:
merge_request
=
render
'shared/issuable/assignees'
,
project:
merge_request
.
project
,
issuable:
merge_request
...
...
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