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
8f6b3d74
Commit
8f6b3d74
authored
Nov 10, 2017
by
George Andrinopoulos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add externalized strings
parent
46cacbe5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/models/concerns/milestoneish.rb
app/models/concerns/milestoneish.rb
+1
-1
app/views/shared/milestones/_sidebar.html.haml
app/views/shared/milestones/_sidebar.html.haml
+3
-3
No files found.
app/models/concerns/milestoneish.rb
View file @
8f6b3d74
...
@@ -87,7 +87,7 @@ module Milestoneish
...
@@ -87,7 +87,7 @@ module Milestoneish
end
end
def
total_issue_time_spent
def
total_issue_time_spent
issues
.
joins
(
:timelogs
).
sum
(
:time_spent
)
@total_issue_time_spent
||=
issues
.
joins
(
:timelogs
).
sum
(
:time_spent
)
end
end
def
human_total_issue_time_spent
def
human_total_issue_time_spent
...
...
app/views/shared/milestones/_sidebar.html.haml
View file @
8f6b3d74
...
@@ -92,14 +92,14 @@
...
@@ -92,14 +92,14 @@
-
if
milestone
.
human_total_issue_time_spent
-
if
milestone
.
human_total_issue_time_spent
=
milestone
.
human_total_issue_time_spent
=
milestone
.
human_total_issue_time_spent
-
else
-
else
None
=
_
(
"None"
)
.title.hide-collapsed
.title.hide-collapsed
Total issue time spent
=
_
(
"Total issue time spent"
)
.value.hide-collapsed
.value.hide-collapsed
-
if
milestone
.
human_total_issue_time_spent
-
if
milestone
.
human_total_issue_time_spent
%span
.bold
=
milestone
.
human_total_issue_time_spent
%span
.bold
=
milestone
.
human_total_issue_time_spent
-
else
-
else
%span
.no-value
No time spent
%span
.no-value
=
_
(
"No time spent"
)
.block.merge-requests
.block.merge-requests
.sidebar-collapsed-icon
.sidebar-collapsed-icon
...
...
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