diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-04 13:06:28 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-04 13:06:28 +0000 |
| commit | 95188e72c252447f280a884074d3d40eec514fff (patch) | |
| tree | b9ddcaa605bcfd16384a5f884a690c5ff76df909 | |
| parent | 3e663a24fe69427fb36ed0371672253e035afb51 (diff) | |
| parent | 099acf714f5a1487bed60780df96f7c4fe7972b0 (diff) | |
| download | gitlab-ce-95188e72c252447f280a884074d3d40eec514fff.tar.gz | |
Merge branch 'backport-es-global-search-difference' into 'master'
Backport differences in global search from EE to CE
See merge request !10445
| -rw-r--r-- | app/services/search/global_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb index a3c655493a5..c1549df5ac6 100644 --- a/app/services/search/global_service.rb +++ b/app/services/search/global_service.rb @@ -18,7 +18,11 @@ module Search end def scope - @scope ||= %w[issues merge_requests milestones].delete(params[:scope]) { 'projects' } + @scope ||= begin + allowed_scopes = %w[issues merge_requests milestones] + + allowed_scopes.delete(params[:scope]) { 'projects' } + end end end end |