summaryrefslogtreecommitdiff
path: root/app/views/admin/application_settings/_form.html.haml
diff options
context:
space:
mode:
authorAndrei Gliga <otzy_007@yahoo.com>2016-05-12 13:40:24 +0300
committerAndrei Gliga <otzy_007@yahoo.com>2016-05-12 13:44:46 +0300
commit6cdce04937837de8014b1c044c91ed5b32bdc90a (patch)
tree258c830a897585098b9749ebc47a773c1521aee8 /app/views/admin/application_settings/_form.html.haml
parent5553ad24e4fe42670ba0f4e2010819abac499e7d (diff)
downloadgitlab-ce-6cdce04937837de8014b1c044c91ed5b32bdc90a.tar.gz
Revert "Revert "no need to show the help about Github or the other authentication sources""
This reverts commit 075ace5686c63d40f7e9fa02bf37e1bd3168f7e7.
Diffstat (limited to 'app/views/admin/application_settings/_form.html.haml')
-rw-r--r--app/views/admin/application_settings/_form.html.haml3
1 files changed, 0 insertions, 3 deletions
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