Commit 9079b56b authored by Andrei Gliga's avatar Andrei Gliga

Revert "no need to show the help about Github or the other authentication sources"

This reverts commit 78a832d0fd7ff445c707809134dbb2a42d2a9e03.

Show help only for the enabled OAuth Providers on oauth-providers-help block

aria: { describedby: help_block_id } instead of 'aria-describedby' => help_block_id

provider and not p

a more simple approach to the OmniAuth helper links for oauth-providers-help
parent 6bd8d3ad
...@@ -71,8 +71,15 @@ module ApplicationSettingsHelper ...@@ -71,8 +71,15 @@ 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',
'aria-describedby' => help_block_id) + Gitlab::OAuth::Provider.label_for(source) aria: { describedby: help_block_id }) + Gitlab::OAuth::Provider.label_for(source)
end end
end end
end end
def oauth_providers_with_help_links
button_based_providers.map do |provider|
Gitlab::OAuth::Provider.label_for(provider) + ' ' +
link_to("(?)", help_page_path("integration", provider))
end
end
end end
...@@ -116,6 +116,9 @@ ...@@ -116,6 +116,9 @@
.btn-group{ data: { toggle: 'buttons' } } .btn-group{ data: { toggle: 'buttons' } }
- oauth_providers_checkboxes('oauth-providers-help').each do |source| - oauth_providers_checkboxes('oauth-providers-help').each do |source|
= source = source
%span.help-block#oauth-providers-help
Enabled OmniAuth must be configured for
= oauth_providers_with_help_links.to_sentence.html_safe
.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'
.col-sm-10 .col-sm-10
......
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