diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-30 19:13:13 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-30 19:13:13 +0300 |
| commit | 2272e95acd5b398a3ccfa12de85c40d285b679d8 (patch) | |
| tree | 2336216d5aa2bd5e05ba98a3f9c356ad0da049b7 /app/helpers | |
| parent | 9cc1294d27d09015bcd1dc73dab187a0f605e22a (diff) | |
| parent | e71351d4f463715fccd80ddbcb4dade67e80f34b (diff) | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/ci/variables/_variable_row.html.haml
Diffstat (limited to 'app/helpers')
| -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 5089da519df..5a2360b4661 100644 --- a/app/helpers/dropdowns_helper.rb +++ b/app/helpers/dropdowns_helper.rb @@ -41,7 +41,7 @@ module DropdownsHelper def dropdown_toggle(toggle_text, data_attr, options = {}) default_label = data_attr[:default_label] - content_tag(:button, 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 #{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 |