aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael.franca@plataformatec.com.br>2012-01-04 14:29:13 -0300
committerRafael Mendonça França <rafael.franca@plataformatec.com.br>2012-01-04 14:29:13 -0300
commit7d26fad384a99aea27e478474f5b8d24ae33b704 (patch)
tree694f333c92128454c9df1a239d8ee1022d1c22f1 /activerecord/lib
parentbdc49dcb4ee2af23599965e98fec1bfe21561c23 (diff)
downloadrails-7d26fad384a99aea27e478474f5b8d24ae33b704.tar.gz
rails-7d26fad384a99aea27e478474f5b8d24ae33b704.tar.bz2
rails-7d26fad384a99aea27e478474f5b8d24ae33b704.zip
No need to require psych since require yaml does that.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/base.rb1
-rw-r--r--activerecord/lib/active_record/fixtures.rb1
-rw-r--r--activerecord/lib/active_record/fixtures/file.rb1
3 files changed, 0 insertions, 3 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'