From 9f46488805e86b1bc341ea1620b866016c2ce5ed Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 May 2020 14:34:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-0-stable-ee --- app/helpers/search_helper.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'app/helpers/search_helper.rb') diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index e478f76818f..5ad65c59a2e 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -58,8 +58,6 @@ module SearchHelper ns_('SearchResults|comment', 'SearchResults|comments', count) when 'projects' ns_('SearchResults|project', 'SearchResults|projects', count) - when 'snippet_blobs' - ns_('SearchResults|snippet result', 'SearchResults|snippet results', count) when 'snippet_titles' ns_('SearchResults|snippet', 'SearchResults|snippets', count) when 'users' @@ -209,11 +207,11 @@ module SearchHelper end end - def search_filter_input_options(type) + def search_filter_input_options(type, placeholder = _('Search or filter results...')) opts = { id: "filtered-search-#{type}", - placeholder: _('Search or filter results...'), + placeholder: placeholder, data: { 'username-params' => UserSerializer.new.represent(@users) }, -- cgit v1.2.3