From 70ef433e09ebfc9d48e990e22f2fb223193dd087 Mon Sep 17 00:00:00 2001 From: Tanguy Herrmann Date: Sat, 24 Nov 2012 18:04:42 +0100 Subject: [PATCH] Rewording for the account being blocked When signing in with SSO, if the default behaviour of gitlab is to block SSO user, the only message the people will get is 'Your account was blocked' They should get the idea this might be only temporary and not because of a technical problem --- app/controllers/application_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ef6fc81a5d5..4b3623aec0f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -34,7 +34,7 @@ class ApplicationController < ActionController::Base def reject_blocked! if current_user && current_user.blocked sign_out current_user - flash[:alert] = "Your account was blocked" + flash[:alert] = "Your account is blocked. Retry when an admin unblock it." redirect_to new_user_session_path end end @@ -42,7 +42,7 @@ class ApplicationController < ActionController::Base def after_sign_in_path_for resource if resource.is_a?(User) && resource.respond_to?(:blocked) && resource.blocked sign_out resource - flash[:alert] = "Your account was blocked" + flash[:alert] = "Your account is blocked. Retry when an admin unblock it." new_user_session_path else super