diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-08 21:07:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-08 21:07:32 +0300 |
| commit | 73391dcc368ef846c2960c1d0ef5e64ca78e1bee (patch) | |
| tree | b111bca95c5a4e45318eb85a238c7916340efff2 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | a7df1d8717d39424ced032d9fe063f08f97e19d6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
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 1f1c01c8fcc..bc3308fd6c6 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -177,7 +177,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController message << _("Create a GitLab account first, and then connect it to your %{label} account.") % { label: label } end - flash[:notice] = message.join(' ') + flash[:alert] = message.join(' ') redirect_to new_user_session_path end |