Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-04-04 14:57:16 +0300
committerNick Thomas <nick@gitlab.com>2017-04-04 14:57:16 +0300
commit099acf714f5a1487bed60780df96f7c4fe7972b0 (patch)
treef7fb38a3830cca345b5dc80af3b5cf20abcb1422 /app/services/search
parent5efd67942cec39d733d27a52edc2ebc86babce30 (diff)
Backport differences in global search from EE to CE
Diffstat (limited to 'app/services/search')
-rw-r--r--app/services/search/global_service.rb6
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