summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-09 18:43:07 +0000
committerRémy Coutable <remy@rymai.me>2017-03-09 18:43:07 +0000
commit130fd255bc0735d4175f2db2770a9092882fa3a4 (patch)
treef7c5789bca40b0299e43a4efeaa2e6bfe4a199c1 /lib/api
parentf1e76a6fa059ae12558014c6858c078586fd2b75 (diff)
parentdd309469997558541debd36aa7a2ea7e8cbece5d (diff)
downloadgitlab-ce-130fd255bc0735d4175f2db2770a9092882fa3a4.tar.gz
Merge branch '28874-fix-milestone-issues-position-order-in-api' into 'master'
Order milestone issues by position ascending in api Closes #28847 See merge request !9635
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/milestones.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/api/milestones.rb b/lib/api/milestones.rb
index e7f7edd95c7..abd263c1dfc 100644
--- a/lib/api/milestones.rb
+++ b/lib/api/milestones.rb
@@ -116,7 +116,8 @@ module API
finder_params = {
project_id: user_project.id,
- milestone_title: milestone.title
+ milestone_title: milestone.title,
+ sort: 'position_asc'
}
issues = IssuesFinder.new(current_user, finder_params).execute
@@ -138,7 +139,8 @@ module API
finder_params = {
project_id: user_project.id,
- milestone_id: milestone.id
+ milestone_id: milestone.id,
+ sort: 'position_asc'
}
merge_requests = MergeRequestsFinder.new(current_user, finder_params).execute