No need to require psych since require yaml does that.

rafaelfranca · Jan 4, 2012 · 7d26fad · 7d26fad
1 parent bdc49dc
commit 7d26fad
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 require 'erb'
-require 'psych'
 require 'yaml'
 require 'optparse'
 require 'rbconfig'