aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@gmail.com>2016-07-16 11:52:46 -0400
committerGitHub <noreply@github.com>2016-07-16 11:52:46 -0400
commit821f6975da0a67c57c48fb076961c6ff6c146ee8 (patch)
treede80cc91d1e42615ecdd041b6163f8b330b4fe6c /actionpack
parent9fa0371e877245469202c68288aadcf6597f8b74 (diff)
parentacf99bde0329c2920f9b75e0e551fd98ea343d9a (diff)
downloadrails-821f6975da0a67c57c48fb076961c6ff6c146ee8.tar.gz
rails-821f6975da0a67c57c48fb076961c6ff6c146ee8.tar.bz2
rails-821f6975da0a67c57c48fb076961c6ff6c146ee8.zip
Merge pull request #25775 from junaruga/hotfix/actionpack-depending-on-activerecord
Remove unused activerecord requirement in actionpack.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/abstract_unit.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 1e1d6f5429..c8a45a0851 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -33,7 +33,6 @@ require 'action_view/testing/resolvers'
require 'action_dispatch'
require 'active_support/dependencies'
require 'active_model'
-require 'active_record'
require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late