diff options
| author | James Lopez <james@jameslopez.es> | 2018-03-06 16:37:10 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-03-06 16:37:10 +0100 |
| commit | f5af2400fc5e2150335e8f81cc311ff29e1f91de (patch) | |
| tree | 012949b77c3c831ff7e904fc135afa096d8752c9 | |
| parent | 39a8b350f8e553c8c3f704ba1708c993c3156967 (diff) | |
| parent | 7c07cf15c9c3b6d93ae902526b91ee1b0d7badc9 (diff) | |
| download | gitlab-ce-fix/auth0-unsafe-login.tar.gz | |
Merge remote-tracking branch 'dev/fix/auth0-unsafe-login' into fix/auth0-unsafe-loginfix/auth0-unsafe-login
# Conflicts:
# 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 fecc3145833..f70d4f6a5c8 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -179,7 +179,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController end def fail_auth0_login - flash[:alert] = 'Wrong extern UID provided. Make sure Auth0 is configured correctly.' + flash[:alert] = 'Authentication request missing UID (user identity). Make sure Auth0 is configured correctly.' redirect_to new_user_session_path end |