Merge branch 'disable-recent-search-on-boards' into 'master'

Disable recent search on issue boards Closes #30919 See merge request !10686

Merge branch 'disable-recent-search-on-boards' into 'master'
Disable recent search on issue boards Closes #30919 See merge request !10686
e5127842 · Filipa Lacerda · Lin Jen-Shin · e1ff4592 · e5127842
Commit e5127842 authored Apr 18, 2017 by Filipa Lacerda Committed by Lin Jen-Shin Apr 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

app/views/shared/issuable/_search_bar.html.haml app/views/shared/issuable/_search_bar.html.haml +8 -7

No files found.
--- 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