diff options
author | Rémy Coutable <remy@rymai.me> | 2016-05-18 23:40:33 -0500 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-05-18 23:40:33 -0500 |
commit | f29d8b64e4bbea0dce64b4dfbae14422d64899c9 (patch) | |
tree | eb2e0ebc962bfcc8bb04c21af274bd537e649959 /lib/api/milestones.rb | |
parent | 715959e58190eca661ea377b949af3515d8da913 (diff) | |
parent | 4607323e130fe5b04e830f7a6de8083b070808f1 (diff) | |
download | gitlab-ce-f29d8b64e4bbea0dce64b4dfbae14422d64899c9.tar.gz |
Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/api/milestones.rb')
-rw-r--r-- | lib/api/milestones.rb | 10 |
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 |