summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorAndrei Gliga <otzy_007@yahoo.com>2016-05-11 10:35:18 +0300
committerAndrei Gliga <otzy_007@yahoo.com>2016-05-12 13:44:46 +0300
commit9079b56bf4f149054e347aa09ad151ab617ef123 (patch)
tree22a431a57854606f6ef363af37a71842e6e334bb /app/helpers
parent6bd8d3ad48b9151c0bcb69bfbce0bc2551cdf184 (diff)
downloadgitlab-ce-9079b56bf4f149054e347aa09ad151ab617ef123.tar.gz
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
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_settings_helper.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 878b1b254ce..82056a4c977 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -71,8 +71,15 @@ module ApplicationSettingsHelper
label_tag(checkbox_name, class: css_class) do
check_box_tag(checkbox_name, source, !disabled,
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
+
+ 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