diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-06-13 12:21:51 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-06-13 12:21:51 +0000 |
| commit | 0a70ba177e4589733659dd5af85402d0a3081026 (patch) | |
| tree | dd6398b122b1f180386beb13402f012c4c2f17ab /lib | |
| parent | 0c4059efc146c869d3ffd1bc075c67c8b4ae921d (diff) | |
| parent | 0a2c334cd558dc4f6e822bac1077f480e9fffc7c (diff) | |
| download | gitlab-ce-0a70ba177e4589733659dd5af85402d0a3081026.tar.gz | |
Merge branch 'ce-12091-remove-elasticsearch-lite-project' into 'master'
Backport changes from 'Partially revert d9cb907c: "Avoid loading objects from DB in ES results"'
See merge request gitlab-org/gitlab-ce!29597
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/search_results.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index 3daa03d01d6..7c1e6b1baff 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -85,10 +85,6 @@ module Gitlab UsersFinder.new(current_user, search: query).execute end - def display_options(_scope) - {} - end - private def projects |