aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/general_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-05-13 16:13:43 +0100
committerLouise Crow <louise.crow@gmail.com>2013-05-13 16:13:43 +0100
commit1908adffcf39e2639925bddfc3b912c9e08d0162 (patch)
treefb99c5aa7196b01a0556d7d50cc5620c442aae48 /app/controllers/general_controller.rb
parent700920b7a7a2b8783f494392d6805e940ab18b80 (diff)
parent1b84df5e1392413822719ef1d4a716665357a2b3 (diff)
Merge branch 'feature/restore-custom-error-pages' into rails-3-develop
Diffstat (limited to 'app/controllers/general_controller.rb')
-rw-r--r--app/controllers/general_controller.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 0df685829..9d0f91dda 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -222,5 +222,11 @@ class GeneralController < ApplicationController
@locale = self.locale_from_params()
render(:layout => false, :content_type => 'text/css')
end
+
+ # Handle requests for non-existent URLs - will be handled by ApplicationController::render_exception
+ def not_found
+ raise RouteNotFound
+ end
+
end