Commit 260c88a7 authored by Andrei Gliga's avatar Andrei Gliga

no need to define the help block since there's no help block

parent 6cdce049
...@@ -61,7 +61,7 @@ module ApplicationSettingsHelper ...@@ -61,7 +61,7 @@ module ApplicationSettingsHelper
end end
end end
def oauth_providers_checkboxes(help_block_id) def oauth_providers_checkboxes
button_based_providers.map do |source| button_based_providers.map do |source|
disabled = current_application_settings.disabled_oauth_sign_in_sources.include?(source.to_s) disabled = current_application_settings.disabled_oauth_sign_in_sources.include?(source.to_s)
css_class = 'btn' css_class = 'btn'
...@@ -70,8 +70,7 @@ module ApplicationSettingsHelper ...@@ -70,8 +70,7 @@ module ApplicationSettingsHelper
label_tag(checkbox_name, class: css_class) do label_tag(checkbox_name, class: css_class) do
check_box_tag(checkbox_name, source, !disabled, check_box_tag(checkbox_name, source, !disabled,
autocomplete: 'off', autocomplete: 'off') + Gitlab::OAuth::Provider.label_for(source)
'aria-describedby' => help_block_id) + Gitlab::OAuth::Provider.label_for(source)
end end
end end
end end
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
= f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth Sign-In sources', class: 'control-label col-sm-2' = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth Sign-In sources', class: 'control-label col-sm-2'
.col-sm-10 .col-sm-10
.btn-group{ data: { toggle: 'buttons' } } .btn-group{ data: { toggle: 'buttons' } }
- oauth_providers_checkboxes('oauth-providers-help').each do |source| - oauth_providers_checkboxes.each do |source|
= source = source
.form-group .form-group
= f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2' = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment