diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-07-02 16:33:38 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-07-23 15:20:12 +0200 |
commit | 70a3c165a9f3882a82cf8946a783ace091635797 (patch) | |
tree | 2d09f34639859b2eadf5b648ac42f55b2419ceb2 /app/controllers/omniauth_callbacks_controller.rb | |
parent | 5dd4dea93baa6386ed860a50125dce3ca3890f16 (diff) | |
download | gitlab-ce-70a3c165a9f3882a82cf8946a783ace091635797.tar.gz |
Allow custom label to be set for authentication providers.auth-icons-labels
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
-rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index fd51b380da2..523264b8ea9 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -72,10 +72,11 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController end end rescue Gitlab::OAuth::SignupDisabledError => e - message = "Signing in using your #{oauth['provider']} account without a pre-existing GitLab account is not allowed." + 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? - message << " Create a GitLab account first, and then connect it to your #{oauth['provider']} account." + message << " Create a GitLab account first, and then connect it to your #{label} account." end flash[:notice] = message |