aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-07-31 11:49:22 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-07-31 11:49:22 -0700
commit0fd78578414f4cc12ce91ee5ba1f238f1c396a94 (patch)
tree9fc4b9dcfd0ea19d8b01875aa9e275df50c2f335
parent82061671dcb464a30a3f45a17171af94b5d30dbc (diff)
parent070513016f5999fbd135285731d5f4b2e0c1b434 (diff)
downloadrails-0fd78578414f4cc12ce91ee5ba1f238f1c396a94.tar.gz
rails-0fd78578414f4cc12ce91ee5ba1f238f1c396a94.tar.bz2
rails-0fd78578414f4cc12ce91ee5ba1f238f1c396a94.zip
Merge pull request #2377 from castlerock/remove_require
remove extra require for 'active_support/dependencies' as it is required
-rw-r--r--actionpack/test/controller/routing_test.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index aa9d193436..b693fbec2b 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1,7 +1,6 @@
# encoding: utf-8
require 'abstract_unit'
require 'controller/fake_controllers'
-require 'active_support/dependencies'
require 'active_support/core_ext/object/with_options'
class MilestonesController < ActionController::Base