diff options
author | Paul Slaughter <pslaughter@gitlab.com> | 2019-07-16 21:52:03 +0000 |
---|---|---|
committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-07-16 21:52:03 +0000 |
commit | dbc90d1f90545728d3efc7b6df0a9a4550c8b528 (patch) | |
tree | d5c0f78e14e6bafe326335a3a4046df0136691f1 /app/helpers/dropdowns_helper.rb | |
parent | 1cb21ec289a223fe30d2d8977f4dd0238b24c6da (diff) | |
download | gitlab-ce-revert-1cb21ec2.tar.gz |
Revert "Merge branch 'revert-af42c169' into 'master'"revert-1cb21ec2
This reverts merge request !30798
Diffstat (limited to 'app/helpers/dropdowns_helper.rb')
-rw-r--r-- | app/helpers/dropdowns_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/dropdowns_helper.rb b/app/helpers/dropdowns_helper.rb index 64c5fae7d96..fd94f07cc2c 100644 --- a/app/helpers/dropdowns_helper.rb +++ b/app/helpers/dropdowns_helper.rb @@ -46,7 +46,7 @@ module DropdownsHelper def dropdown_toggle(toggle_text, data_attr, options = {}) default_label = data_attr[:default_label] - content_tag(:button, disabled: options[:disabled], class: "dropdown-menu-toggle #{options[:toggle_class] if options.key?(:toggle_class)}", id: (options[:id] if options.key?(:id)), type: "button", data: data_attr) do + content_tag(:button, disabled: options[:disabled], class: "dropdown-menu-toggle btn #{options[:toggle_class] if options.key?(:toggle_class)}", id: (options[:id] if options.key?(:id)), type: "button", data: data_attr) do output = content_tag(:span, toggle_text, class: "dropdown-toggle-text #{'is-default' if toggle_text == default_label}") output << icon('chevron-down') output.html_safe |