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
1c91ae4d
Commit
1c91ae4d
authored
Jun 29, 2021
by
Marvin Karegyeya
Committed by
Vitaly Slobodin
Jun 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update gl-alert markup in file
parent
32006887
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
app/views/shared/issuable/_form.html.haml
app/views/shared/issuable/_form.html.haml
+10
-5
No files found.
app/views/shared/issuable/_form.html.haml
View file @
1c91ae4d
...
...
@@ -6,11 +6,16 @@
=
form_errors
(
issuable
)
-
if
@conflict
.gl-alert.gl-alert-danger.gl-mb-5
Someone edited the
#{
issuable
.
class
.
model_name
.
human
.
downcase
}
the same time you did.
Please check out
=
link_to
"the
#{
issuable
.
class
.
model_name
.
human
.
downcase
}
"
,
polymorphic_path
([
@project
,
issuable
]),
target:
"_blank"
,
rel:
'noopener noreferrer'
and make sure your changes will not unintentionally remove theirs
=
render
'shared/global_alert'
,
variant: :danger
,
dismissible:
false
,
is_contained:
true
,
alert_class:
'gl-mb-5'
do
.gl-alert-body
Someone edited the
#{
issuable
.
class
.
model_name
.
human
.
downcase
}
the same time you did.
Please check out
=
link_to
"the
#{
issuable
.
class
.
model_name
.
human
.
downcase
}
"
,
polymorphic_path
([
@project
,
issuable
]),
target:
"_blank"
,
rel:
'noopener noreferrer'
and make sure your changes will not unintentionally remove theirs
=
render
'shared/issuable/form/branch_chooser'
,
issuable:
issuable
,
form:
form
...
...
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