diff options
author | Phil Hughes <me@iamphill.com> | 2016-05-23 09:49:13 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-05-24 08:42:52 +0100 |
commit | 5cca2d3bb171c260ad4b07f2a69962d3856c4d99 (patch) | |
tree | dbf18f711b91436e9569042ac9112c663ba4adf1 /app/helpers/application_helper.rb | |
parent | fac08c3bcd7316794bcbcfb5cec32ac05cb104fe (diff) | |
download | gitlab-ce-5cca2d3bb171c260ad4b07f2a69962d3856c4d99.tar.gz |
Updated Ruby based on feedbackissue-filter-name-options
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r-- | app/helpers/application_helper.rb | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 59a04578c58..a3fe1d01292 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -263,7 +263,8 @@ module ApplicationHelper assignee_id: params[:assignee_id], author_id: params[:author_id], sort: params[:sort], - issue_search: params[:issue_search] + issue_search: params[:issue_search], + label_name: params[:label_name] } options = exist_opts.merge(options) @@ -276,19 +277,9 @@ module ApplicationHelper params = options.compact - path = request.path + params.delete(:label_name) unless add_label - if !params.nil? - path << "?#{params.to_param}" - if add_label - if params[:label_name].present? and params[:label_name].respond_to?('any?') - params[:label_name].each do |label| - path << "&label_name[]=#{label}" - end - end - end - end - path + "#{request.path}?#{params.to_param}" end def outdated_browser? |