diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-20 15:45:42 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-20 15:45:42 +0000 |
| commit | 43be046e7b185c7c590d9d22aace9403833ef6da (patch) | |
| tree | 0be23bb788525857cd7da71450f65309da04d3db | |
| parent | 699badabc9670e836eafaf1c66248f49ea41a098 (diff) | |
| parent | 00ac4b8e57980607bea9949ae8febaf9f5decdca (diff) | |
| download | gitlab-ce-43be046e7b185c7c590d9d22aace9403833ef6da.tar.gz | |
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
| -rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index d35f332e1e0..f7abad54286 100644 --- 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? diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 62ebd69485c..aecefbc6e8f 100644 --- 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 |