diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-16 16:29:35 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-16 16:29:35 +0000 |
| commit | c6701d45474acab6a2d687d2e2ffdaac5c0d5491 (patch) | |
| tree | 5e18ab8b3e41bed293e4e1748f780c0fad94fd79 /lib | |
| parent | 451cbe1f69d65b24568a53ec7aa4a7fba2c46933 (diff) | |
| parent | 0520ee44985528d3076df1208bda7c6c7ff8ec79 (diff) | |
| download | gitlab-ce-c6701d45474acab6a2d687d2e2ffdaac5c0d5491.tar.gz | |
Merge branch 'issue_20900' into 'master'
Remove issuable drag and drop and sorting from milestone view
Closes #20900
See merge request !11950
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/milestones.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/milestones.rb b/lib/api/milestones.rb index a3ea619a2fb..3541d3c95fb 100644 --- a/lib/api/milestones.rb +++ b/lib/api/milestones.rb @@ -117,7 +117,7 @@ module API finder_params = { project_id: user_project.id, milestone_title: milestone.title, - sort: 'position_asc' + sort: 'label_priority' } issues = IssuesFinder.new(current_user, finder_params).execute @@ -140,7 +140,7 @@ module API finder_params = { project_id: user_project.id, milestone_title: milestone.title, - sort: 'position_asc' + sort: 'label_priority' } merge_requests = MergeRequestsFinder.new(current_user, finder_params).execute |