diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2012-02-09 13:21:56 +0000 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2012-02-09 13:21:56 +0000 |
commit | 308707f1512fc43c570023ee786463d37e43f1fb (patch) | |
tree | ea7ebdaaf9988a8adfa91b8ff2b496a92a6624f9 /app/controllers/request_controller.rb | |
parent | b1a683778e817005751ac08654d17366d4cda624 (diff) | |
parent | 46646f8e659dc3c567495424088eb66e6ef2feee (diff) |
Merge branch 'release/0.5.1'
Conflicts:
README.md
Diffstat (limited to 'app/controllers/request_controller.rb')
-rw-r--r-- | app/controllers/request_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 2295d6718..313a57d7d 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -220,6 +220,8 @@ class RequestController < ApplicationController render :template => 'user/banned' return end + # User did exceed limit + @next_request_permitted_at = authenticated_user.next_request_permitted_at end # First time we get to the page, just display it |