Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
8f6b3d74
Commit
8f6b3d74
authored
7 years ago
by
George Andrinopoulos
Browse files
Options
Download
Email Patches
Plain Diff
Add externalized strings
parent
46cacbe5
Changes
2
Hide 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
end
def
total_issue_time_spent
issues
.
joins
(
:timelogs
).
sum
(
:time_spent
)
@total_issue_time_spent
||=
issues
.
joins
(
:timelogs
).
sum
(
:time_spent
)
end
def
human_total_issue_time_spent
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/milestones/_sidebar.html.haml
View file @
8f6b3d74
...
...
@@ -92,14 +92,14 @@
-
if
milestone
.
human_total_issue_time_spent
=
milestone
.
human_total_issue_time_spent
-
else
None
=
_
(
"
None
"
)
.title.hide-collapsed
Total issue time spent
=
_
(
"
Total issue time spent
"
)
.value.hide-collapsed
-
if
milestone
.
human_total_issue_time_spent
%span
.bold
=
milestone
.
human_total_issue_time_spent
-
else
%span
.no-value
No time spent
%span
.no-value
=
_
(
"
No time spent
"
)
.block.merge-requests
.sidebar-collapsed-icon
...
...
This diff is collapsed.
Click to expand it.
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