Download as
Browse Code »

Commit 70ef433e09ebfc9d48e990e22f2fb223193dd087

Authored by Tanguy Herrmann
1 parent 5f7dc99a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @70ef433
... ... @@ -34,7 +34,7 @@ class ApplicationController < ActionController::Base
34 34 def reject_blocked!
35 35 if current_user && current_user.blocked
36 36 sign_out current_user
37   - flash[:alert] = "Your account was blocked"
  37 + flash[:alert] = "Your account is blocked. Retry when an admin unblock it."
38 38 redirect_to new_user_session_path
39 39 end
40 40 end
... ... @@ -42,7 +42,7 @@ class ApplicationController < ActionController::Base
42 42 def after_sign_in_path_for resource
43 43 if resource.is_a?(User) && resource.respond_to?(:blocked) && resource.blocked
44 44 sign_out resource
45   - flash[:alert] = "Your account was blocked"
  45 + flash[:alert] = "Your account is blocked. Retry when an admin unblock it."
46 46 new_user_session_path
47 47 else
48 48 super
... ...