Merge branch 'fix-double-query-string-url' into 'master'

Fix double query string in url This MR should fix the double query string in url that shows up while using the "filter by name .." input on projects list pages and also closes [17743](https://gitlab.com/gitlab-org/gitlab-ce/issues/17743) Closes #17743 See merge request !4480

Merge branch 'fix-double-query-string-url' into 'master'
43be046e · Robert Speicher · 699badab · 00ac4b8e · 43be046e · 43be046e
Commit 43be046e authored Jun 20, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

_projects_head.html.haml app/views/dashboard/_projects_head.html.haml +1 -1

show.html.haml app/views/groups/show.html.haml +1 -1

No files found.
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -13,7 +13,7 @@
        Explore Projects

  .nav-controls
-    = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
+    = form_tag request.path, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
      = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control input-short projects-list-filter', spellcheck: false, id: 'project-filter-form-field', tabindex: "2"
    = render 'shared/projects/dropdown'
    - if current_user.can_create_project?

--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -33,7 +33,7 @@
          = link_to "#shared", 'data-toggle' => 'tab' do
            Shared Projects
    .nav-controls
-      = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
+      = form_tag request.path, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
        = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false
      = render 'shared/projects/dropdown'
      - if can? current_user, :create_projects, @group