Merge pull request #4113 from peterlefanulumsdaine/master

grammar fix in an error message (very minor change)

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