diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-04 20:09:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-04 20:09:29 +0000 |
| commit | 42e0e35784de81d2a0f7bff05870ddc5c531d0bb (patch) | |
| tree | c5faca1dd9357d615403ea4f17b41de3e462187c | |
| parent | 3720b98e1bdea5901817dd7a58df532bd5e75077 (diff) | |
| parent | b1757c200ca219b2c9c40c3895252014f6a22379 (diff) | |
| download | gitlab-ce-42e0e35784de81d2a0f7bff05870ddc5c531d0bb.tar.gz | |
Merge branch 'search-on-groups-is-ugly' into 'master'
Change placeholder text to just 'search'
Fixes #13168
See merge request !2711
| -rw-r--r-- | app/helpers/application_helper.rb | 12 | ||||
| -rw-r--r-- | app/views/layouts/_search.html.haml | 2 |
2 files changed, 1 insertions, 13 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 diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index a44f5762a6b..659f5a7756b 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -1,6 +1,6 @@ .search = form_tag search_path, method: :get, class: 'navbar-form pull-left' do |f| - = search_field_tag "search", nil, placeholder: search_placeholder, class: "search-input form-control", spellcheck: false + = search_field_tag "search", nil, placeholder: 'search', class: "search-input form-control", spellcheck: false = hidden_field_tag :group_id, @group.try(:id) - if @project && @project.persisted? = hidden_field_tag :project_id, @project.id |