aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-08-17 18:41:10 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-08-17 18:41:10 -0300
commit0d4834583f3d62c0baa73fc607851ab6c6f39acf (patch)
treeff82d3de76850cdb9878270b6e8e2297966265cd
parentb79ab88245587515a842c498dd7d0fe3cd8cef57 (diff)
parent48a240bcbe09cadb7dedb3c6440cbdcb9f7c9d58 (diff)
downloadrails-0d4834583f3d62c0baa73fc607851ab6c6f39acf.tar.gz
rails-0d4834583f3d62c0baa73fc607851ab6c6f39acf.tar.bz2
rails-0d4834583f3d62c0baa73fc607851ab6c6f39acf.zip
Merge pull request #21276 from rodzyn/fix_build
Fix master build
-rw-r--r--actionpack/lib/action_controller/test_case.rb1
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'