summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-01-22 18:43:21 -0500
committerRubén Dávila <rdavila84@gmail.com>2016-01-22 18:43:21 -0500
commitc3c92c7317df157e156c3a34ff9f4c562229479f (patch)
treec9e6581ee971c46ed9d00408b0ab77e18c1f7090 /app/controllers/application_controller.rb
parent9ef468922c2ed5a02250414576fcf98ad1ac23cb (diff)
downloadgitlab-ce-c3c92c7317df157e156c3a34ff9f4c562229479f.tar.gz
Make default sorting preference work for Issues and MRs.issue_5546
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 540cc30bed5..824175c8a6c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -410,10 +410,8 @@ class ApplicationController < ActionController::Base
private
def set_default_sort
- key = if is_a_listing_page_for?('issues')
- 'issues_sort'
- elsif is_a_listing_page_for?('merge_requests')
- 'merge_requests_sort'
+ key = if is_a_listing_page_for?('issues') || is_a_listing_page_for?('merge_requests')
+ 'issuable_sort'
end
cookies[key] = params[:sort] if key && params[:sort].present?