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
Léo-Paul Géneau
gitlab-ce
Commits
b5ece088
Commit
b5ece088
authored
Mar 29, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ruby fixes
parent
35b3c709
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
12 deletions
+5
-12
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+4
-11
app/models/global_milestone.rb
app/models/global_milestone.rb
+1
-1
No files found.
app/helpers/issuables_helper.rb
View file @
b5ece088
...
@@ -48,18 +48,11 @@ module IssuablesHelper
...
@@ -48,18 +48,11 @@ module IssuablesHelper
end
end
def
milestone_dropdown_label
(
milestone_title
,
default_label
)
def
milestone_dropdown_label
(
milestone_title
,
default_label
)
milestone_title
=
if
milestone_title
==
Milestone
::
Upcoming
.
name
if
milestone_title
==
Milestone
::
Upcoming
.
name
milestone_title
=
Milestone
::
Upcoming
.
title
Milestone
::
Upcoming
.
title
else
milestone_title
end
if
!
milestone_title
.
nil?
&&
!
milestone_title
.
empty?
h
(
milestone_title
)
else
default_label
end
end
h
(
milestone_title
.
presence
||
default_label
)
end
end
private
private
...
...
app/models/global_milestone.rb
View file @
b5ece088
...
@@ -8,7 +8,7 @@ class GlobalMilestone
...
@@ -8,7 +8,7 @@ class GlobalMilestone
milestones
=
milestones
.
group_by
(
&
:title
)
milestones
=
milestones
.
group_by
(
&
:title
)
milestones
.
map
do
|
title
,
milestones
|
milestones
.
map
do
|
title
,
milestones
|
new
(
title
,
milestones
)
new
(
title
,
milestones
)
end
end
end
end
...
...
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