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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
22eb7881
Commit
22eb7881
authored
May 28, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bring changes from EE
parent
71dea693
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/views/shared/milestones/_sidebar.html.haml
app/views/shared/milestones/_sidebar.html.haml
+3
-1
app/views/shared/milestones/_top.html.haml
app/views/shared/milestones/_top.html.haml
+2
-0
No files found.
app/views/shared/milestones/_sidebar.html.haml
View file @
22eb7881
...
...
@@ -78,7 +78,7 @@
%span
=
milestone
.
issues_visible_to_user
(
current_user
).
count
.title.hide-collapsed
Issues
%span
.badg
.badge-pille
=
milestone
.
issues_visible_to_user
(
current_user
).
count
%span
.badg
e.badge-pill
=
milestone
.
issues_visible_to_user
(
current_user
).
count
-
if
show_new_issue_link?
(
project
)
=
link_to
new_project_issue_path
(
project
,
issue:
{
milestone_id:
milestone
.
id
}),
class:
"float-right"
,
title:
"New Issue"
do
New issue
...
...
@@ -99,6 +99,8 @@
=
_
(
'Time tracking'
)
=
icon
(
'spinner spin'
)
=
render_if_exists
'shared/milestones/weight'
,
milestone:
milestone
.block.merge-requests
.sidebar-collapsed-icon.has-tooltip
{
title:
milestone_merge_requests_tooltip_text
(
milestone
),
data:
{
container:
'body'
,
html:
'true'
,
placement:
'left'
,
boundary:
'viewport'
}
}
%strong
...
...
app/views/shared/milestones/_top.html.haml
View file @
22eb7881
...
...
@@ -48,6 +48,8 @@
-
close_msg
=
group
?
'You may close the milestone now.'
:
'Navigate to the project to close the milestone.'
%span
All issues for this milestone are closed.
#{
close_msg
}
=
render_if_exists
'shared/milestones/burndown'
,
milestone:
@milestone
,
project:
@project
-
if
is_dynamic_milestone
.table-holder
%table
.table
...
...
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