diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-02 11:49:34 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-02 11:49:34 -0300 |
commit | bff5ef624f3d3500f551ac9909bb9930ed0e5f36 (patch) | |
tree | eee27d10d4f1e0bd3ae4a206d1aee3afb1745acb | |
parent | 2e500e5c93dd398bf40448321e9c455d6e4f4689 (diff) | |
parent | a6db1edb3a2cd843244627957fa97480742735b5 (diff) | |
download | rails-bff5ef624f3d3500f551ac9909bb9930ed0e5f36.tar.gz rails-bff5ef624f3d3500f551ac9909bb9930ed0e5f36.tar.bz2 rails-bff5ef624f3d3500f551ac9909bb9930ed0e5f36.zip |
Merge pull request #16770 from arthurnn/add_string_strip_require
Add and Remove string/strip require
3 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb index adad6cd542..6bab260f5a 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/string/strip' + module ActiveRecord module ConnectionAdapters class AbstractAdapter diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index cf0e3a260d..fb07e915a0 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -2,7 +2,6 @@ require 'date' require 'set' require 'bigdecimal' require 'bigdecimal/util' -require 'active_support/core_ext/string/strip' module ActiveRecord module ConnectionAdapters #:nodoc: diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index d5be8034e7..1a76beb3f3 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -1,4 +1,5 @@ require 'arel/visitors/bind_visitor' +require 'active_support/core_ext/string/strip' module ActiveRecord module ConnectionAdapters |