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
Tatuya Kamada
gitlab-ce
Commits
58456e26
Commit
58456e26
authored
Jun 08, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for MR comments.
parent
329f6cb9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/milestone_select.js.coffee
app/assets/javascripts/milestone_select.js.coffee
+2
-2
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
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
No files found.
app/assets/javascripts/milestone_select.js.coffee
View file @
58456e26
...
@@ -25,7 +25,7 @@ class @MilestoneSelect
...
@@ -25,7 +25,7 @@ class @MilestoneSelect
if
issueUpdateURL
if
issueUpdateURL
milestoneLinkTemplate
=
_
.
template
(
milestoneLinkTemplate
=
_
.
template
(
'<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>">
'<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>">
<span class="has-tooltip" data-container="body"
data-
title="<%= remaining %>">
<span class="has-tooltip" data-container="body" title="<%= remaining %>">
<%= _.escape(title) %>
<%= _.escape(title) %>
</span>
</span>
</a>'
</a>'
...
@@ -34,7 +34,7 @@ class @MilestoneSelect
...
@@ -34,7 +34,7 @@ class @MilestoneSelect
milestoneLinkNoneTemplate
=
'<div class="light">None</div>'
milestoneLinkNoneTemplate
=
'<div class="light">None</div>'
collapsedSidebarLabelTemplate
=
_
.
template
(
collapsedSidebarLabelTemplate
=
_
.
template
(
'<span class="has-tooltip" data-container="body"
data-
title="<%= remaining %>" data-placement="left">
'<span class="has-tooltip" data-container="body" title="<%= remaining %>" data-placement="left">
<%= _.escape(title) %>
<%= _.escape(title) %>
</span>'
</span>'
)
)
...
...
app/helpers/milestones_helper.rb
View file @
58456e26
...
@@ -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
,
'Past
D
ue'
)
content_tag
(
:strong
,
'Past
d
ue'
)
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 @
58456e26
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
-
if
@milestone
.
closed?
-
if
@milestone
.
closed?
Closed
Closed
-
elsif
@milestone
.
expired?
-
elsif
@milestone
.
expired?
Past
D
ue
Past
d
ue
-
else
-
else
Open
Open
%span
.identifier
%span
.identifier
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
58456e26
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
.value.bold.hide-collapsed
.value.bold.hide-collapsed
-
if
issuable
.
milestone
-
if
issuable
.
milestone
=
link_to
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
issuable
.
milestone
)
do
=
link_to
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
issuable
.
milestone
)
do
%span
.has-tooltip
{
"title"
=>
milestone_remaining_days
(
issuable
.
milestone
),
data:
{
container:
'body'
,
html:
1
}
}
%span
.has-tooltip
{
title:
milestone_remaining_days
(
issuable
.
milestone
),
data:
{
container:
'body'
,
html:
1
}
}
=
issuable
.
milestone
.
title
=
issuable
.
milestone
.
title
-
else
-
else
.light
None
.light
None
...
...
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