diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-30 12:50:06 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-30 12:50:06 -0800 |
| commit | c177593e2cf282f09934640bd597e6e3c5f32893 (patch) | |
| tree | 64025d2f7b0bf20705fb28a219cbbae8d8a8abec | |
| parent | 10ec9b2293646f88a1edeea472de82bda340d9c6 (diff) | |
| parent | 70ef433e09ebfc9d48e990e22f2fb223193dd087 (diff) | |
| download | gitlab-ce-c177593e2cf282f09934640bd597e6e3c5f32893.tar.gz | |
Merge pull request #2059 from dolanor/feature-rewording-blocked-users
Rewording for the account being blocked
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 66f2e87de3e..5735c1d2916 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -35,7 +35,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 @@ -43,7 +43,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 |