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
d3b7633d
Commit
d3b7633d
authored
Mar 13, 2016
by
tiagonbotelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes small issues
parent
b94bdb69
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
CHANGELOG
CHANGELOG
+0
-1
app/finders/issuable_finder.rb
app/finders/issuable_finder.rb
+2
-2
No files found.
CHANGELOG
View file @
d3b7633d
...
@@ -35,7 +35,6 @@ v 8.5.5
...
@@ -35,7 +35,6 @@ v 8.5.5
- Prevent a 500 error in Todos when author was removed
- Prevent a 500 error in Todos when author was removed
- Fix pagination for filtered dashboard and explore pages
- Fix pagination for filtered dashboard and explore pages
- Fix "Show all" link behavior
- Fix "Show all" link behavior
- Add #upcoming filter to Milestone filter (Tiago Botelho)
- Add #upcoming filter to Milestone filter (Tiago Botelho)
- Add #upcoming filter to Milestone filter (Tiago Botelho)
v 8.5.4
v 8.5.4
...
...
app/finders/issuable_finder.rb
View file @
d3b7633d
...
@@ -244,7 +244,7 @@ class IssuableFinder
...
@@ -244,7 +244,7 @@ class IssuableFinder
items
items
end
end
def
upcoming
?
def
filter_by_upcoming_milestone
?
params
[
:milestone_title
]
==
'#upcoming'
params
[
:milestone_title
]
==
'#upcoming'
end
end
...
@@ -252,7 +252,7 @@ class IssuableFinder
...
@@ -252,7 +252,7 @@ class IssuableFinder
if
milestones?
if
milestones?
if
filter_by_no_milestone?
if
filter_by_no_milestone?
items
=
items
.
where
(
milestone_id:
[
-
1
,
nil
])
items
=
items
.
where
(
milestone_id:
[
-
1
,
nil
])
elsif
upcoming
?
elsif
filter_by_upcoming_milestone
?
upcoming
=
Milestone
.
where
(
project_id:
projects
).
upcoming
upcoming
=
Milestone
.
where
(
project_id:
projects
).
upcoming
items
=
items
.
joins
(
:milestone
).
where
(
milestones:
{
title:
upcoming
.
title
})
items
=
items
.
joins
(
:milestone
).
where
(
milestones:
{
title:
upcoming
.
title
})
else
else
...
...
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