diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-10-03 10:10:07 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2014-10-03 10:10:07 +0200 |
| commit | d97a9d493560a77883b2016b0949207d614cc40b (patch) | |
| tree | 9133ded5b1fef760ef89ab8ea7ef72852e5943ec /app/controllers/application_controller.rb | |
| parent | a835b0ce1771c94d50c69830da4811353be60dcb (diff) | |
| parent | 9f45e22993b3904436c314065730482c800a1f67 (diff) | |
| download | gitlab-ce-d97a9d493560a77883b2016b0949207d614cc40b.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5ffec7f75bf..1a5215ca309 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -62,7 +62,7 @@ class ApplicationController < ActionController::Base end end - 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? sign_out resource flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it." |