diff options
| author | Andrei Gliga <otzy_007@yahoo.com> | 2016-05-12 13:40:24 +0300 |
|---|---|---|
| committer | Andrei Gliga <otzy_007@yahoo.com> | 2016-05-12 13:44:46 +0300 |
| commit | 6cdce04937837de8014b1c044c91ed5b32bdc90a (patch) | |
| tree | 258c830a897585098b9749ebc47a773c1521aee8 | |
| parent | 5553ad24e4fe42670ba0f4e2010819abac499e7d (diff) | |
| download | gitlab-ce-6cdce04937837de8014b1c044c91ed5b32bdc90a.tar.gz | |
Revert "Revert "no need to show the help about Github or the other authentication sources""
This reverts commit 075ace5686c63d40f7e9fa02bf37e1bd3168f7e7.
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 9 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 82056a4c977..878b1b254ce 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -71,15 +71,8 @@ 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 diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index f3681bc96e3..576509e3f2b 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -116,9 +116,6 @@ .btn-group{ data: { toggle: 'buttons' } } - oauth_providers_checkboxes('oauth-providers-help').each do |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 = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2' .col-sm-10 |