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:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-02-04 23:09:29 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-02-04 23:09:29 +0300
commit42e0e35784de81d2a0f7bff05870ddc5c531d0bb (patch)
treec5faca1dd9357d615403ea4f17b41de3e462187c /app/helpers/application_helper.rb
parent3720b98e1bdea5901817dd7a58df532bd5e75077 (diff)
parentb1757c200ca219b2c9c40c3895252014f6a22379 (diff)
Merge branch 'search-on-groups-is-ugly' into 'master'
Change placeholder text to just 'search' Fixes #13168 ![Screen_Shot_2016-02-04_at_12.30.16_PM](/uploads/ca3c5549abeedce99d693606135d7428/Screen_Shot_2016-02-04_at_12.30.16_PM.png) See merge request !2711
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 14f098d8355..622cbfe3cc4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -169,18 +169,6 @@ module ApplicationHelper
Gitlab.config.extra
end
- def search_placeholder
- if @project && @project.persisted?
- 'Search'
- elsif @snippet || @snippets || @show_snippets
- 'Search snippets'
- elsif @group && @group.persisted?
- 'Search in this group'
- else
- 'Search'
- end
- end
-
# Render a `time` element with Javascript-based relative date and tooltip
#
# time - Time object