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:
authorJacob Schatz <jschatz@gitlab.com>2017-04-06 19:32:09 +0300
committerJacob Schatz <jschatz@gitlab.com>2017-04-06 19:32:09 +0300
commit3f60fe1a6045bac777357aa0d962e1a11552468c (patch)
tree49c91eca87d5ab814938d4ae4e3b37fd88dd16ff /app/helpers
parentdf10507f3eb43bda9cc6adbebf8c2d1736c3463f (diff)
parentb7ce488df57ad2c0e2e509c906747cc31c5bef1f (diff)
Merge branch '27262-issue-recent-searches' into 'master'
Recent search history for issues Closes #27262 See merge request !10324
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/dropdowns_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/dropdowns_helper.rb b/app/helpers/dropdowns_helper.rb
index 81e0b6bb5ae..8ed99642c7a 100644
--- a/app/helpers/dropdowns_helper.rb
+++ b/app/helpers/dropdowns_helper.rb
@@ -1,6 +1,6 @@
module DropdownsHelper
def dropdown_tag(toggle_text, options: {}, &block)
- content_tag :div, class: "dropdown" do
+ content_tag :div, class: "dropdown #{options[:wrapper_class] if options.has_key?(:wrapper_class)}" do
data_attr = { toggle: "dropdown" }
if options.has_key?(:data)
@@ -20,7 +20,7 @@ module DropdownsHelper
output << dropdown_filter(options[:placeholder])
end
- output << content_tag(:div, class: "dropdown-content") do
+ output << content_tag(:div, class: "dropdown-content #{options[:content_class] if options.has_key?(:content_class)}") do
capture(&block) if block && !options.has_key?(:footer_content)
end