diff options
| author | Markus Koller <markus-koller@gmx.ch> | 2017-11-23 13:16:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-23 13:16:14 +0000 |
| commit | 257fd5713485a05460a9170190100643199a7e48 (patch) | |
| tree | afaaddcdc16ac407d72b7b4c0e96d951a141c268 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | a6cafbcbe8d6802a81055c3469312f889cd73c9a (diff) | |
| download | gitlab-ce-257fd5713485a05460a9170190100643199a7e48.tar.gz | |
Allow password authentication to be disabled entirely
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 56baa19f864..e3c18cba1dd 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -140,7 +140,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController label = Gitlab::OAuth::Provider.label_for(oauth['provider']) message = "Signing in using your #{label} account without a pre-existing GitLab account is not allowed." - if current_application_settings.signup_enabled? + if current_application_settings.allow_signup? message << " Create a GitLab account first, and then connect it to your #{label} account." end |