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
ec453235
Commit
ec453235
authored
Jun 28, 2021
by
Marvin Karegyeya
Committed by
Kushal Pandya
Jun 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update gl-alert markup
parent
336e847d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
19 deletions
+24
-19
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+11
-13
app/views/shared/milestones/_milestone_complete_alert.html.haml
...ews/shared/milestones/_milestone_complete_alert.html.haml
+10
-0
app/views/shared/milestones/_top.html.haml
app/views/shared/milestones/_top.html.haml
+3
-6
No files found.
app/views/projects/milestones/show.html.haml
View file @
ec453235
...
@@ -12,19 +12,17 @@
...
@@ -12,19 +12,17 @@
=
render_if_exists
'shared/milestones/burndown'
,
milestone:
@milestone
,
project:
@project
=
render_if_exists
'shared/milestones/burndown'
,
milestone:
@milestone
,
project:
@project
-
if
can?
(
current_user
,
:read_issue
,
@project
)
&&
@milestone
.
total_issues_count
==
0
-
if
can?
(
current_user
,
:read_issue
,
@project
)
&&
@milestone
.
total_issues_count
==
0
.gl-alert.gl-alert-info.gl-mt-3.gl-mb-5
{
data:
{
testid:
'no-issues-alert'
}
}
=
render
'shared/global_alert'
,
.gl-alert-container
variant: :info
,
=
sprite_icon
(
'information-o'
,
size:
16
,
css_class:
'gl-icon gl-alert-icon gl-alert-icon-no-title'
)
dismissible:
false
,
.gl-alert-content
is_contained:
true
,
.gl-alert-body
alert_data:
{
testid:
'no-issues-alert'
},
%span
=
_
(
'Assign some issues to this milestone.'
)
alert_class:
'gl-mt-3 gl-mb-5'
do
-
elsif
@milestone
.
complete?
&&
@milestone
.
active?
.gl-alert-body
.gl-alert.gl-alert-success.gl-mt-3.gl-mb-5
{
data:
{
testid:
'all-issues-closed-alert'
}
}
=
_
(
'Assign some issues to this milestone.'
)
.gl-alert-container
-
else
=
sprite_icon
(
'check-circle'
,
size:
16
,
css_class:
'gl-icon gl-alert-icon gl-alert-icon-no-title'
)
=
render
'shared/milestones/milestone_complete_alert'
,
milestone:
@milestone
do
.gl-alert-content
=
_
(
'All issues for this milestone are closed. You may close this milestone now.'
)
.gl-alert-body
%span
=
_
(
'All issues for this milestone are closed. You may close this milestone now.'
)
=
render
'shared/milestones/tabs'
,
milestone:
@milestone
=
render
'shared/milestones/tabs'
,
milestone:
@milestone
=
render
'shared/milestones/sidebar'
,
milestone:
@milestone
,
project:
@project
,
affix_offset:
153
=
render
'shared/milestones/sidebar'
,
milestone:
@milestone
,
project:
@project
,
affix_offset:
153
app/views/shared/milestones/_milestone_complete_alert.html.haml
0 → 100644
View file @
ec453235
-
milestone
=
local_assigns
[
:milestone
]
-
if
milestone
.
complete?
&&
milestone
.
active?
=
render
'shared/global_alert'
,
variant: :success
,
is_contained:
true
,
alert_data:
{
testid:
'all-issues-closed-alert'
},
dismissible:
false
do
.gl-alert-body
=
yield
app/views/shared/milestones/_top.html.haml
View file @
ec453235
...
@@ -5,11 +5,8 @@
...
@@ -5,11 +5,8 @@
=
render
'shared/milestones/header'
,
milestone:
milestone
=
render
'shared/milestones/header'
,
milestone:
milestone
=
render
'shared/milestones/description'
,
milestone:
milestone
=
render
'shared/milestones/description'
,
milestone:
milestone
=
render
'shared/milestones/milestone_complete_alert'
,
milestone:
milestone
do
-
if
milestone
.
complete?
&&
milestone
.
active?
=
_
(
'All issues for this milestone are closed.'
)
.gl-alert.gl-alert-success.gl-mt-3
=
group
?
_
(
'You may close the milestone now.'
)
:
_
(
'Navigate to the project to close the milestone.'
)
%span
=
_
(
'All issues for this milestone are closed.'
)
=
group
?
_
(
'You may close the milestone now.'
)
:
_
(
'Navigate to the project to close the milestone.'
)
=
render_if_exists
'shared/milestones/burndown'
,
milestone:
milestone
,
project:
@project
=
render_if_exists
'shared/milestones/burndown'
,
milestone:
milestone
,
project:
@project
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