diff options
author | Rémy Coutable <remy@rymai.me> | 2018-12-17 15:50:55 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-12-17 15:50:55 +0300 |
commit | 19fec9a800eca581ecbc4b17012dfd5e720ed3f2 (patch) | |
tree | 0b0e891280889d6bed19dcdc768a8ccd9ec8940f /app/helpers | |
parent | c59ff995a46457fed880bbebb0f32ad0cd8961cf (diff) | |
parent | 7d1a7261f07886fceeb932cfa8ba4aa5001f8b83 (diff) |
Merge branch 'update-page-filter-path-defaults' into 'master'
Change `page_filter_path` to not exclude `label_name` by default
See merge request gitlab-org/gitlab-ce!23825
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/application_helper.rb | 7 | ||||
-rw-r--r-- | app/helpers/sorting_helper.rb | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 74042f0bae8..82bb2d1a805 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -171,7 +171,6 @@ module ApplicationHelper def page_filter_path(options = {}) without = options.delete(:without) - add_label = options.delete(:label) options = request.query_parameters.merge(options) @@ -181,11 +180,7 @@ module ApplicationHelper end end - params = options.compact - - params.delete(:label_name) unless add_label - - "#{request.path}?#{params.to_param}" + "#{request.path}?#{options.compact.to_param}" end def outdated_browser? diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb index 67c808b167a..f51b96ba8ce 100644 --- a/app/helpers/sorting_helper.rb +++ b/app/helpers/sorting_helper.rb @@ -164,7 +164,7 @@ module SortingHelper reverse_sort = issuable_reverse_sort_order_hash[sort_value] if reverse_sort - reverse_url = page_filter_path(sort: reverse_sort, label: true) + reverse_url = page_filter_path(sort: reverse_sort) else reverse_url = '#' link_class += ' disabled' |