diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-19 08:52:15 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-26 09:03:04 +0100 |
| commit | 3137559dfd45ff0e7fa6653ed1ba3d75836e4c45 (patch) | |
| tree | ba0995b8f27fa2449850b65d3ee445048cf75bb0 | |
| parent | f5bea9df5325fe136042fb32fe282cc04c2ec91a (diff) | |
| download | gitlab-ce-3137559dfd45ff0e7fa6653ed1ba3d75836e4c45.tar.gz | |
Fixed issue with dropdown option not sticking
CHANGELOG item
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/search_controller.rb | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index a4794485476..083b5893696 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -133,6 +133,7 @@ v 8.6.7 - Fix persistent XSS vulnerability in `commit_person_link` helper - Fix persistent XSS vulnerability in Label and Milestone dropdowns - Fix vulnerability that made it possible to enumerate private projects belonging to group + - Updated search UI v 8.6.6 - Expire the exists cache before deletion to ensure project dir actually exists (Stan Hu). !3413 diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index e42d2d73947..8263bb5b0ac 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -6,10 +6,6 @@ class SearchController < ApplicationController layout 'search' def show - return if params[:search].nil? || params[:search].blank? - - @search_term = params[:search] - if params[:project_id].present? @project = Project.find_by(id: params[:project_id]) @project = nil unless can?(current_user, :download_code, @project) @@ -20,6 +16,9 @@ class SearchController < ApplicationController @group = nil unless can?(current_user, :read_group, @group) end + return if params[:search].nil? || params[:search].blank? + @search_term = params[:search] + @scope = params[:scope] @show_snippets = params[:snippets].eql? 'true' |