diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-17 18:41:10 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-17 18:41:10 -0300 |
commit | 0d4834583f3d62c0baa73fc607851ab6c6f39acf (patch) | |
tree | ff82d3de76850cdb9878270b6e8e2297966265cd /actionpack/lib/action_controller | |
parent | b79ab88245587515a842c498dd7d0fe3cd8cef57 (diff) | |
parent | 48a240bcbe09cadb7dedb3c6440cbdcb9f7c9d58 (diff) | |
download | rails-0d4834583f3d62c0baa73fc607851ab6c6f39acf.tar.gz rails-0d4834583f3d62c0baa73fc607851ab6c6f39acf.tar.bz2 rails-0d4834583f3d62c0baa73fc607851ab6c6f39acf.zip |
Merge pull request #21276 from rodzyn/fix_build
Fix master build
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 94f18cefc3..e012fa617e 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -1,4 +1,5 @@ require 'rack/session/abstract/id' +require 'active_support/core_ext/hash/conversions' require 'active_support/core_ext/object/to_query' require 'active_support/core_ext/module/anonymous' require 'active_support/core_ext/hash/keys' |