diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-12 11:23:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-12 11:23:12 +0000 |
| commit | 734df1bb504aedec6a5668567de808b549a84749 (patch) | |
| tree | f49589fdf85ace7b53cbb0c519b418ba1a99f591 /lib/api | |
| parent | 25998f57a8eae4e8b9a6e938383dfaef9532b27b (diff) | |
| parent | 9d03e8fd5c564b20f3a1ef18583aa4c7c2b27cfc (diff) | |
| download | gitlab-ce-734df1bb504aedec6a5668567de808b549a84749.tar.gz | |
Merge branch 'api-fix-milestone-iid-filter' into 'master'
API: Add iid filter to milestones
This was documented in the API docs but it was never working because the iid filter was never applied to the milestones. The tests were working by accident because the were checking the first element, which was by accident the request element.
* Closes https://github.com/gitlabhq/gitlabhq/issues/10122
See merge request !3588
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/milestones.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/milestones.rb b/lib/api/milestones.rb index 0f3f505fa05..84b4d4cdd6d 100644 --- a/lib/api/milestones.rb +++ b/lib/api/milestones.rb @@ -21,6 +21,7 @@ module API # state (optional) - Return "active" or "closed" milestones # Example Request: # GET /projects/:id/milestones + # GET /projects/:id/milestones?iid=42 # GET /projects/:id/milestones?state=active # GET /projects/:id/milestones?state=closed get ":id/milestones" do @@ -28,6 +29,7 @@ module API milestones = user_project.milestones milestones = filter_milestones_state(milestones, params[:state]) + milestones = filter_by_iid(milestones, params[:iid]) if params[:iid].present? present paginate(milestones), with: Entities::Milestone end |