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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b8ca423c
Commit
b8ca423c
authored
Oct 27, 2014
by
Sacred Seven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed milestone Expired_at rendering
parent
261e7ea5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
app/models/milestone.rb
app/models/milestone.rb
+2
-2
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/_issues.html.haml
+1
-1
app/views/projects/milestones/_milestone.html.haml
app/views/projects/milestones/_milestone.html.haml
+1
-1
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+2
-2
No files found.
app/models/milestone.rb
View file @
b8ca423c
...
...
@@ -71,9 +71,9 @@ class Milestone < ActiveRecord::Base
def
expires_at
if
due_date
if
due_date
.
past?
"expired at
#{
due_date
.
stamp
(
"Aug 21, 2011
"
)
}
"
"expired at
#{
JalaliDate
.
new
(
due_date
).
strftime
(
"%A %d %b %Y
"
)
}
"
else
"expires at
#{
due_date
.
stamp
(
"Aug 21, 2011
"
)
}
"
"expires at
#{
JalaliDate
.
new
(
due_date
).
strftime
(
"%A %d %b %Y
"
)
}
"
end
end
end
...
...
app/views/projects/issues/_issues.html.haml
View file @
b8ca423c
...
...
@@ -46,7 +46,7 @@
%li
=
link_to
project_filter_path
(
milestone_id:
milestone
.
id
)
do
%strong
=
milestone
.
title
%small
.light
expires at
#{
JalaliDate
.
new
(
Date
.
parse
(
milestone
.
expires_at
)).
strftime
(
"%A %d %b %Y"
)
}
%small
.light
=
milestone
.
expires_at
.pull-right
=
render
'shared/sort_dropdown'
...
...
app/views/projects/milestones/_milestone.html.haml
View file @
b8ca423c
...
...
@@ -10,7 +10,7 @@
-
if
milestone
.
expired?
and
not
milestone
.
closed?
%span
.cred
(Expired)
%small
=
"expires at
#{
JalaliDate
.
new
(
Date
.
parse
(
milestone
.
expires_at
)).
strftime
(
"%A %d %b %Y"
)
}
"
=
milestone
.
expires_at
-
if
milestone
.
is_empty?
%span
.muted
Empty
-
else
...
...
app/views/projects/milestones/show.html.haml
View file @
b8ca423c
...
...
@@ -30,7 +30,7 @@
-
else
Open
.creator
=
JalaliDate
.
new
(
Date
.
parse
(
@milestone
.
expires_at
)).
strftime
(
"%A %d %b %Y"
)
=
@milestone
.
expires_at
%h4
.title
{
dir: :auto
}
=
gfm
escape_once
(
@milestone
.
title
)
...
...
@@ -49,7 +49,7 @@
#{
@milestone
.
open_items_count
}
open
%span
.light
#{
@milestone
.
percent_complete
}
% complete
%span
.pull-right
=
"expires at
#{
JalaliDate
.
new
(
Date
.
parse
(
@milestone
.
expires_at
)).
strftime
(
"%A %d %b %Y"
)
}
"
%span
.pull-right
=
@milestone
.
expires_at
.progress.progress-info
.progress-bar
{
style:
"width: #{@milestone.percent_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