aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-12-18 16:08:20 +0000
committerLouise Crow <louise.crow@gmail.com>2014-12-18 16:08:20 +0000
commitd4d8096429cc9a97efbde63ef37cd1cc7d12708c (patch)
tree6ab3b13fa0a37e02876d9ac808e5ba00ea8d967b /app/controllers/application_controller.rb
parentc0a3dc4571090fc553fd608cf1ac83e21f0290f4 (diff)
parent6d587c328b7d58fb322bd9cf490b213c3ff1ffad (diff)
Merge branch 'brakeman_fixes' into rails-3-develop
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a06fa7098..dbd879a1c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -14,6 +14,8 @@ class ApplicationController < ActionController::Base
end
class RouteNotFound < StandardError
end
+ protect_from_forgery
+
# assign our own handler method for non-local exceptions
rescue_from Exception, :with => :render_exception