diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-18 11:14:15 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-19 14:19:16 +0800 |
| commit | e512784233da8b854b56f89e55692566066a9915 (patch) | |
| tree | 78ba126a6342cb2004858c19cd9d4e7693623158 | |
| parent | e1ff45924503cbb91c51387b648c2f4c2bd8df6c (diff) | |
| download | gitlab-ce-e512784233da8b854b56f89e55692566066a9915.tar.gz | |
Merge branch 'disable-recent-search-on-boards' into 'master'
Disable recent search on issue boards
Closes #30919
See merge request !10686
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index b447996a8ab..f1350169bbe 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -12,13 +12,14 @@ class: "check_all_issues left" .issues-other-filters.filtered-search-wrapper .filtered-search-box - = dropdown_tag(content_tag(:i, '', class: 'fa fa-history'), - options: { wrapper_class: "filtered-search-history-dropdown-wrapper", - toggle_class: "filtered-search-history-dropdown-toggle-button", - dropdown_class: "filtered-search-history-dropdown", - content_class: "filtered-search-history-dropdown-content", - title: "Recent searches" }) do - .js-filtered-search-history-dropdown + - if type != :boards_modal && type != :boards + = dropdown_tag(content_tag(:i, '', class: 'fa fa-history'), + options: { wrapper_class: "filtered-search-history-dropdown-wrapper", + toggle_class: "filtered-search-history-dropdown-toggle-button", + dropdown_class: "filtered-search-history-dropdown", + content_class: "filtered-search-history-dropdown-content", + title: "Recent searches" }) do + .js-filtered-search-history-dropdown .filtered-search-box-input-container .scroll-container %ul.tokens-container.list-unstyled |