diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-29 20:24:39 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-29 20:24:39 +0000 |
| commit | 59b5b15d56600ffc26d657dfea134ffcfc879725 (patch) | |
| tree | 46b2fd44234965ff32725c499571b4c9d2814ec4 /app/controllers/request_controller.rb | |
| parent | cb9c215d3eb3369d7f619d98c55e357247ca72d1 (diff) | |
| parent | 500b4d37702cdbad113ccb94c875e90dd770231a (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'app/controllers/request_controller.rb')
| -rw-r--r-- | app/controllers/request_controller.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index a70e8d16c..fc1ffdd75 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -208,8 +208,12 @@ class RequestController < ApplicationController # Banned from making new requests? if !authenticated_user.nil? && !authenticated_user.can_file_requests? - @details = authenticated_user.can_fail_html - render :template => 'user/banned' + if authenticated_user.exceeded_limit? + render :template => 'user/rate_limited' + else + @details = authenticated_user.can_fail_html + render :template => 'user/banned' + end return end |