summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-06-08 16:55:50 -0300
committerFelipe Artur <felipefac@gmail.com>2017-06-16 12:01:41 -0300
commit673bc07c0f6cb936fbc2037440634133ad32afaf (patch)
tree48c625891376898e1bc9389064ae49ff3cb1309f /app/controllers/concerns
parent86fc145c3c0c5056d7c6be1d62cd0b5beec2b1a9 (diff)
downloadgitlab-ce-673bc07c0f6cb936fbc2037440634133ad32afaf.tar.gz
Order merge requests by priority
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/milestone_actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/milestone_actions.rb b/app/controllers/concerns/milestone_actions.rb
index b2536a1c949..4bda26fdfd1 100644
--- a/app/controllers/concerns/milestone_actions.rb
+++ b/app/controllers/concerns/milestone_actions.rb
@@ -6,7 +6,7 @@ module MilestoneActions
format.html { redirect_to milestone_redirect_path }
format.json do
render json: tabs_json("shared/milestones/_merge_requests_tab", {
- merge_requests: @milestone.merge_requests,
+ merge_requests: @milestone.merge_requests.sort('priority'),
show_project_name: true
})
end