summaryrefslogtreecommitdiff
path: root/lib/api/milestones.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-03 10:45:45 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-03 10:45:45 +0200
commitdf5b73e17d5ff672d522a2414ce1c4fe557ac64d (patch)
treedbbfb4ab4c30ef4cb09eeaf2b33d02e5c6dd54a3 /lib/api/milestones.rb
parente9eeeaa0d0c8820f66a9581d8b4d03f02ac705d0 (diff)
parentf0c4f727359a5848d12e2097bad6a6a3190943ef (diff)
downloadgitlab-ce-df5b73e17d5ff672d522a2414ce1c4fe557ac64d.tar.gz
Merge branch 'master' into group-navigation-redesign
Diffstat (limited to 'lib/api/milestones.rb')
-rw-r--r--lib/api/milestones.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/api/milestones.rb b/lib/api/milestones.rb
index 84b4d4cdd6d..132043cf3f7 100644
--- a/lib/api/milestones.rb
+++ b/lib/api/milestones.rb
@@ -105,7 +105,15 @@ module API
authorize! :read_milestone, user_project
@milestone = user_project.milestones.find(params[:milestone_id])
- present paginate(@milestone.issues), with: Entities::Issue, current_user: current_user
+
+ finder_params = {
+ project_id: user_project.id,
+ milestone_title: @milestone.title,
+ state: 'all'
+ }
+
+ issues = IssuesFinder.new(current_user, finder_params).execute
+ present paginate(issues), with: Entities::Issue, current_user: current_user
end
end