From 308146dc398fd4c13453048105498018459e0985 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 10 Oct 2019 00:06:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/omniauth_callbacks_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/controllers/omniauth_callbacks_controller.rb') diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 755ce3463c4..b992972dfb8 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -148,6 +148,11 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController if user.two_factor_enabled? && !auth_user.bypass_two_factor? prompt_for_two_factor(user) else + if user.deactivated? + user.activate + flash[:notice] = _('Welcome back! Your account had been deactivated due to inactivity but is now reactivated.') + end + sign_in_and_redirect(user, event: :authentication) end else -- cgit v1.2.3