diff options
| author | Grzegorz Bizon | OOO until May 7th <grzegorz@gitlab.com> | 2018-04-30 18:00:04 +0300 |
|---|---|---|
| committer | Grzegorz Bizon | OOO until May 7th <grzegorz@gitlab.com> | 2018-04-30 18:00:04 +0300 |
| commit | d9ccc3af6f8d7f7890effc6c279ac6a0c0597a26 (patch) | |
| tree | 9b412a01ac49273a10cbf1854257304982846b81 /app/helpers | |
| parent | 9267ef0bd1d2d9ee4b7fe596762fec3e978a02f3 (diff) | |
| parent | 9904ac8129d67ea760f2fa3727f7062805b0e4f7 (diff) | |
Merge branch 'ce-jej/branch-unprotection-disable-ui' into 'master'
Backports EE changes from disabling branch unprotect UI
See merge request gitlab-org/gitlab-ce!18262
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 |