deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rewording for the account being blocked

Browse source 
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
This commit is contained in:
Tanguy Herrmann 2012-11-24 18:04:42 +01:00
parent 5f7dc99a62
commit 70ef433e09
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -34,7 +34,7 @@ class ApplicationController < ActionController::Base
def reject_blocked! def reject_blocked!
if current_user && current_user.blocked if current_user && current_user.blocked
sign_out current_user 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 redirect_to new_user_session_path
end end
end end
@ -42,7 +42,7 @@ class ApplicationController < ActionController::Base
def after_sign_in_path_for resource def after_sign_in_path_for resource
if resource.is_a?(User) && resource.respond_to?(:blocked) && resource.blocked if resource.is_a?(User) && resource.respond_to?(:blocked) && resource.blocked
sign_out resource 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 new_user_session_path
else else
super super