Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Gliga <otzy_007@yahoo.com>2016-05-09 19:32:01 +0300
committerAndrei Gliga <otzy_007@yahoo.com>2016-05-12 13:44:46 +0300
commit3c3bc93747ebe5864a50d7b8203b357a40012ed4 (patch)
tree652b3a53e50704d7fee92a30800fdd933ab5ebb6 /app/views/admin
parent038dbb6803948e050484ed3f34c99b2f3bf7a6c5 (diff)
if omniauth is enabled and if there are button_based_providers available show the disable OAuth sources
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/application_settings/_form.html.haml21
1 files changed, 11 insertions, 10 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 729c2ff563d..81c232b7e92 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -109,16 +109,17 @@
= f.label :signin_enabled do
= f.check_box :signin_enabled
Sign-in enabled
- .form-group
- = f.label :disable_oauth_signin_sources, 'Disable OAuth Sign-In sources', class: 'control-label col-sm-2'
- .col-sm-10
- - data_attrs = { toggle: 'buttons' }
- .btn-group{ data: data_attrs }
- - oauth_providers_checkboxes('oauth-providers-help').each do |source|
- = source
- %span.help-block#oauth-providers-help
- Enabled OmniAuth must be configured for GitHub
- = link_to "(?)", help_page_path("integration", "github")
+ - if omniauth_enabled? && !button_based_providers.empty?
+ .form-group
+ = f.label :disable_oauth_signin_sources, 'Disable OAuth Sign-In sources', class: 'control-label col-sm-2'
+ .col-sm-10
+ - data_attrs = { toggle: 'buttons' }
+ .btn-group{ data: data_attrs }
+ - oauth_providers_checkboxes('oauth-providers-help').each do |source|
+ = source
+ %span.help-block#oauth-providers-help
+ Enabled OmniAuth must be configured for GitHub
+ = link_to "(?)", help_page_path("integration", "github")
.form-group
= f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
.col-sm-10