diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-12-11 15:21:06 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-02-22 17:11:36 +0100 |
| commit | 148816cd67a314f17e79c107270cc708501bdd39 (patch) | |
| tree | eba07d109322392bb5862b715adc066a0ebbdf95 /app/controllers/search_controller.rb | |
| parent | b5306075c21f5546d1447052558da6227629c15e (diff) | |
| download | gitlab-ce-148816cd67a314f17e79c107270cc708501bdd39.tar.gz | |
Port `read_cross_project` ability from EE
Diffstat (limited to 'app/controllers/search_controller.rb')
| -rw-r--r-- | app/controllers/search_controller.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index fbad9ba7db8..983f888b8ec 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -1,9 +1,14 @@ class SearchController < ApplicationController - skip_before_action :authenticate_user! - + include ControllerWithCrossProjectAccessCheck include SearchHelper include RendersCommits + skip_before_action :authenticate_user! + requires_cross_project_access if: -> do + search_term_present = params[:search].present? || params[:term].present? + search_term_present && !params[:project_id].present? + end + layout 'search' def show |