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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-04 18:09:38 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-04 18:09:38 +0300
commit39a548dd06b8ddcc0d2acb7832460f5fe1876521 (patch)
treecc901a7c997f0e3e614d34291342cf98702daa36 /app/helpers/search_helper.rb
parent72797f4a602d0061636df39df89e11896de2a524 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/search_helper.rb')
-rw-r--r--app/helpers/search_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 63984782f20..5ad65c59a2e 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -207,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)
},