diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-09 08:29:30 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-09 08:29:30 +0000 |
commit | 43e410ad04d2e2927a79b31623c9dee084e04863 (patch) | |
tree | 22d8597cde38d78b850557e3bcbb9a5b2ceb9074 /app/controllers | |
parent | 27a9ff8264ff45a3753dd64ff4af62c121ff7f0b (diff) | |
parent | 335749d7540530ae3de3bfa0715be0f2e7ef608d (diff) | |
download | gitlab-ce-43e410ad04d2e2927a79b31623c9dee084e04863.tar.gz |
Merge branch 'rs-issue-1750' into 'master'
Ensure `@sort` is set by set_filters_params
Closes #1750
See merge request !943
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/application_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 63fc146f1d1..8a9d0ce6ff4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -265,6 +265,7 @@ class ApplicationController < ActionController::Base params[:scope] = 'all' if params[:scope].blank? params[:state] = 'opened' if params[:state].blank? + @sort = params[:sort] @filter_params = params.dup if @project |