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
Boxiang Sun
gitlab-ce
Commits
d032f370
Commit
d032f370
authored
Jun 16, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add merge request data to the progress information on Milestones pages.
Fixes #13980.
parent
38d0b5b5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
CHANGELOG
CHANGELOG
+1
-0
app/views/shared/milestones/_summary.html.haml
app/views/shared/milestones/_summary.html.haml
+7
-0
No files found.
CHANGELOG
View file @
d032f370
...
@@ -23,6 +23,7 @@ v 8.9.0 (unreleased)
...
@@ -23,6 +23,7 @@ v 8.9.0 (unreleased)
- Added descriptions to notification settings dropdown
- Added descriptions to notification settings dropdown
- Improve note validation to prevent errors when creating invalid note via API
- Improve note validation to prevent errors when creating invalid note via API
- Reduce number of fog gem dependencies
- Reduce number of fog gem dependencies
- Add number of merge requests for a given milestone to the milestones view.
- Implement a fair usage of shared runners
- Implement a fair usage of shared runners
- Remove project notification settings associated with deleted projects
- Remove project notification settings associated with deleted projects
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects
...
...
app/views/shared/milestones/_summary.html.haml
View file @
d032f370
...
@@ -10,6 +10,13 @@
...
@@ -10,6 +10,13 @@
open and
open and
%strong
=
milestone
.
issues_visible_to_user
(
current_user
).
closed
.
size
%strong
=
milestone
.
issues_visible_to_user
(
current_user
).
closed
.
size
closed
closed
%strong
=
milestone
.
merge_requests
.
size
merge requests:
%span
.milestone-stat
%strong
=
milestone
.
merge_requests
.
opened
.
size
open and
%strong
=
milestone
.
merge_requests
.
merged
.
size
merged
%span
.milestone-stat
%span
.milestone-stat
%strong
==
#{
milestone
.
percent_complete
(
current_user
)
}
%
%strong
==
#{
milestone
.
percent_complete
(
current_user
)
}
%
complete
complete
...
...
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