diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-29 23:23:29 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-29 23:23:29 -0700 |
| commit | 962ccce3d1c32be308697522f52291b58b982d25 (patch) | |
| tree | 57b30c58d58a957ed0e69a2efca7e436959431f8 | |
| parent | 88176dad560d4a6767ad01664029e35896fcb995 (diff) | |
| parent | 6b4602a733ddd485c751e52ae831d1c4f2165b92 (diff) | |
| download | gitlab-ce-962ccce3d1c32be308697522f52291b58b982d25.tar.gz | |
Merge pull request #4113 from peterlefanulumsdaine/master
grammar fix in an error message (very minor change)
| -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 d156166503f..9bb86b80d1e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -32,7 +32,7 @@ class ApplicationController < ActionController::Base def reject_blocked! if current_user && current_user.blocked? sign_out current_user - flash[:alert] = "Your account is blocked. Retry when an admin unblock it." + flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it." redirect_to new_user_session_path end end @@ -40,7 +40,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 is blocked. Retry when an admin unblock it." + flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it." new_user_session_path else super |