diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-01 11:49:22 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-01 11:49:22 +0000 |
| commit | 7d3e888d069c3035b25f0dc8ff5efc8e52063db9 (patch) | |
| tree | 7fa412989e927b6f66b4b2b23f59caeb70310bb8 /app/views/admin/application_settings/_form.html.haml | |
| parent | 538852fe5f15a779708ef51ca9e647100d41bdf1 (diff) | |
| parent | 37383d9a9d9706008a7fa1d90079cb019681094b (diff) | |
| download | gitlab-ce-7d3e888d069c3035b25f0dc8ff5efc8e52063db9.tar.gz | |
Merge branch '37202-revert-changes-to-signing-enabled' into 'master'
Rollback changes made to signing_enabled.
Closes #37202
See merge request !13956
Diffstat (limited to 'app/views/admin/application_settings/_form.html.haml')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 734a08c61fa..54dfc9695d7 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -153,7 +153,7 @@ .checkbox = f.label :password_authentication_enabled do = f.check_box :password_authentication_enabled - Password authentication 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' |