diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-05-12 23:11:37 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-05-12 23:11:37 +0300 |
| commit | 74c69709dc19dbaf56c226b5a7955f229af10f4f (patch) | |
| tree | f30de4af54ac8397c92d48c0aa5d4943152b339c /app/views/admin | |
| parent | f2303f9df061d6ff85d0ff0fee9e3aa54df97ea7 (diff) | |
| parent | d66833bca5ae0347751ceab99062b638965eab78 (diff) | |
Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index e0d8d16a954..f7c799c968f 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -109,6 +109,13 @@ = f.label :signin_enabled do = f.check_box :signin_enabled Sign-in enabled + - if omniauth_enabled? && button_based_providers.any? + .form-group + = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth Sign-In sources', class: 'control-label col-sm-2' + .col-sm-10 + .btn-group{ data: { toggle: 'buttons' } } + - oauth_providers_checkboxes.each do |source| + = source .form-group = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2' .col-sm-10 |