diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2013-02-01 14:01:04 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2013-02-01 14:01:04 +0900 |
| commit | b40bd16b7b0810b9d5621339f243c4a9569ceb96 (patch) | |
| tree | 905138ef910868f4f01ef7ee1b6efa745c49528e /actionpack/lib/action_controller | |
| parent | 9c1cd6b142b12cb1a4f748787e68a612406585af (diff) | |
| download | rails-b40bd16b7b0810b9d5621339f243c4a9569ceb96.tar.gz rails-b40bd16b7b0810b9d5621339f243c4a9569ceb96.tar.bz2 rails-b40bd16b7b0810b9d5621339f243c4a9569ceb96.zip | |
Missing require hash/keys
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index eddee08545..6e0cd51d8b 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/hash/keys' + module ActionController module ConditionalGet extend ActiveSupport::Concern diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index e9cf4372e4..5ae5dd331a 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -1,6 +1,7 @@ require 'rack/session/abstract/id' require 'active_support/core_ext/object/to_query' require 'active_support/core_ext/module/anonymous' +require 'active_support/core_ext/hash/keys' module ActionController module TemplateAssertions |