summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-06-09 12:54:20 -0300
committerFelipe Artur <felipefac@gmail.com>2017-06-16 12:02:20 -0300
commit2e3f0b08fbc0387d3f7985bf61c16e8ec9821750 (patch)
tree32e5d96bbfb20ec79f5dbf5a9448ab40f0ff4a04 /app/controllers
parent673bc07c0f6cb936fbc2037440634133ad32afaf (diff)
downloadgitlab-ce-2e3f0b08fbc0387d3f7985bf61c16e8ec9821750.tar.gz
Remove old specs and add new ones
Diffstat (limited to 'app/controllers')
-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 4bda26fdfd1..1ff785ac2ca 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.sort('priority'),
+ merge_requests: @milestone.sorted_merge_requests,
show_project_name: true
})
end