diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-21 15:06:07 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-21 15:06:07 -0500 |
| commit | eccaa099d185c351f9e8762661f0dc004f11f256 (patch) | |
| tree | 000e3b7c01b5a5294db1cd3d79960b9ae0658c16 | |
| parent | 0f79620ccb049dc8146ab3c639f993122329eb83 (diff) | |
| download | gitlab-ce-eccaa099d185c351f9e8762661f0dc004f11f256.tar.gz | |
Make cookie suffix more simpler.
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9df37a677c0..fb5900054ce 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -409,8 +409,8 @@ class ApplicationController < ActionController::Base private def set_default_sort - controller_name = params[:controller].sub(/Controller\Z/, '').underscore - cookie_suffix = "_sort_#{controller_name}" + # Use the controller name so we have a distinct cookie for Issues, MRs and Dashboard + cookie_suffix = "_sort_#{params[:controller].underscore}" key = "#{(@project || @group || current_user).cookie_key}#{cookie_suffix}" |