diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2012-01-04 14:29:13 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2012-01-04 14:29:13 -0300 |
| commit | 7d26fad384a99aea27e478474f5b8d24ae33b704 (patch) | |
| tree | 694f333c92128454c9df1a239d8ee1022d1c22f1 | |
| parent | bdc49dcb4ee2af23599965e98fec1bfe21561c23 (diff) | |
| download | rails-7d26fad384a99aea27e478474f5b8d24ae33b704.tar.gz rails-7d26fad384a99aea27e478474f5b8d24ae33b704.tar.bz2 rails-7d26fad384a99aea27e478474f5b8d24ae33b704.zip | |
No need to require psych since require yaml does that.
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/fixtures/file.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/yaml_serialization_test.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/ordered_hash_test.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/safe_buffer_test.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/commands/dbconsole.rb | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 5ce78ca1c6..5c8dbd1b47 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1,4 +1,3 @@ -require 'psych' require 'yaml' require 'set' require 'active_support/benchmarkable' diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 8ae09d3e27..339ba1e19e 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -1,5 +1,4 @@ require 'erb' -require 'psych' require 'yaml' require 'zlib' require 'active_support/dependencies' diff --git a/activerecord/lib/active_record/fixtures/file.rb b/activerecord/lib/active_record/fixtures/file.rb index f6fc883ee0..6547791144 100644 --- a/activerecord/lib/active_record/fixtures/file.rb +++ b/activerecord/lib/active_record/fixtures/file.rb @@ -1,4 +1,3 @@ -require 'psych' require 'erb' require 'yaml' diff --git a/activerecord/test/cases/yaml_serialization_test.rb b/activerecord/test/cases/yaml_serialization_test.rb index dfdb27e5ab..302913e095 100644 --- a/activerecord/test/cases/yaml_serialization_test.rb +++ b/activerecord/test/cases/yaml_serialization_test.rb @@ -1,4 +1,3 @@ -require 'psych' require 'cases/helper' require 'models/topic' diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb index 841088e7e7..78de7fb6ab 100644 --- a/activesupport/test/ordered_hash_test.rb +++ b/activesupport/test/ordered_hash_test.rb @@ -1,4 +1,3 @@ -require 'psych' require 'abstract_unit' require 'active_support/json' require 'active_support/core_ext/object/to_json' diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb index e569e04180..2fde07995b 100644 --- a/activesupport/test/safe_buffer_test.rb +++ b/activesupport/test/safe_buffer_test.rb @@ -1,5 +1,4 @@ require 'abstract_unit' -require 'psych' require 'active_support/core_ext/string/inflections' require 'yaml' diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index d71e7f5271..6fc127efae 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -1,5 +1,4 @@ require 'erb' -require 'psych' require 'yaml' require 'optparse' require 'rbconfig' |