diff options
| author | Azul <azul@leap.se> | 2012-11-04 17:57:03 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-04 17:57:03 +0100 |
| commit | c0f92bf9f481463dcaef6f4b30343130a8910a00 (patch) | |
| tree | 3ba89c6f38d19a7b96a0ef599b7cb6364ba5821f /test/dummy/app/controllers | |
| parent | b92d418ebec6486a9e728c57f38f82d4c3343341 (diff) | |
| parent | 19008253d01fd6d7a864e98a7ae5dc216070aee1 (diff) | |
Merge branch 'develop' into feature-warden-srp
Conflicts:
Gemfile.lock
users/app/controllers/application_controller.rb
users/leap_web_users.gemspec
Diffstat (limited to 'test/dummy/app/controllers')
| -rw-r--r-- | test/dummy/app/controllers/application_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb index e8065d9..be7aa1f 100644 --- a/test/dummy/app/controllers/application_controller.rb +++ b/test/dummy/app/controllers/application_controller.rb @@ -1,3 +1,5 @@ class ApplicationController < ActionController::Base protect_from_forgery + + ActiveSupport.run_load_hooks(:application_controller, self) end |