diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-09 12:53:07 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-09 12:53:07 +0000 |
| commit | 89a1999479e1da7ab78e48d23fddb3b14ebbb40e (patch) | |
| tree | 46b3e7a782a397524a0b1dc62d7403371e142ebc /app/controllers/application_controller.rb | |
| parent | 8d633f37bed60871fc59312dd436fb3ff7b6e37c (diff) | |
| parent | 9f5f602fbb38a32619dad93464c1ab263b1a66d7 (diff) | |
Merge branch 'owasp-fixes' into rails-3-develop
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4d3f40d40..1ccf7e5db 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -17,6 +17,9 @@ class ApplicationController < ActionController::Base # assign our own handler method for non-local exceptions rescue_from Exception, :with => :render_exception + # Add some security-related headers (see config/initializers/secure_headers.rb) + ensure_security_headers + # Standard headers, footers and navigation for whole site layout "default" include FastGettext::Translation # make functions like _, n_, N_ etc available) |