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
4f5ee68f
Commit
4f5ee68f
authored
Jun 08, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Copy changes for milestone due dates.
parent
b868b814
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/lib/common_utils.js.coffee
app/assets/javascripts/lib/common_utils.js.coffee
+1
-1
app/helpers/milestones_helper.rb
app/helpers/milestones_helper.rb
+1
-1
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+1
-1
No files found.
app/assets/javascripts/lib/common_utils.js.coffee
View file @
4f5ee68f
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
return
''
unless
time
return
''
unless
time
suffix
or=
'remaining'
suffix
or=
'remaining'
expiredLabel
or=
'
expired
'
expiredLabel
or=
'
Past due
'
jQuery
.
timeago
.
settings
.
allowFuture
=
yes
jQuery
.
timeago
.
settings
.
allowFuture
=
yes
...
...
app/helpers/milestones_helper.rb
View file @
4f5ee68f
...
@@ -56,7 +56,7 @@ module MilestonesHelper
...
@@ -56,7 +56,7 @@ module MilestonesHelper
def
milestone_remaining_days
(
milestone
)
def
milestone_remaining_days
(
milestone
)
if
milestone
.
expired?
if
milestone
.
expired?
content_tag
(
:strong
,
'
expired
'
)
content_tag
(
:strong
,
'
Past Due
'
)
elsif
milestone
.
due_date
elsif
milestone
.
due_date
days
=
milestone
.
remaining_days
days
=
milestone
.
remaining_days
content
=
content_tag
(
:strong
,
days
)
content
=
content_tag
(
:strong
,
days
)
...
...
app/views/projects/milestones/show.html.haml
View file @
4f5ee68f
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
-
if
@milestone
.
closed?
-
if
@milestone
.
closed?
Closed
Closed
-
elsif
@milestone
.
expired?
-
elsif
@milestone
.
expired?
Expired
Past Due
-
else
-
else
Open
Open
%span
.identifier
%span
.identifier
...
...
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