aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/fixtures.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael.franca@plataformatec.com.br>2012-01-04 13:30:57 -0300
committerRafael Mendonça França <rafael.franca@plataformatec.com.br>2012-01-04 13:30:57 -0300
commit761b049b2e51a035eaf9c18f4d0200409848a28e (patch)
treebdfed99b3d0b46ca7e2b079a46d46fa241549eab /activerecord/lib/active_record/fixtures.rb
parent0bf51e9805260243ec0bbe5fca8f8b9364fdd970 (diff)
downloadrails-761b049b2e51a035eaf9c18f4d0200409848a28e.tar.gz
rails-761b049b2e51a035eaf9c18f4d0200409848a28e.tar.bz2
rails-761b049b2e51a035eaf9c18f4d0200409848a28e.zip
No need to use rescue block to require psych
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
-rw-r--r--activerecord/lib/active_record/fixtures.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 9ea8cf864c..8ae09d3e27 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -1,10 +1,5 @@
require 'erb'
-
-begin
- require 'psych'
-rescue LoadError
-end
-
+require 'psych'
require 'yaml'
require 'zlib'
require 'active_support/dependencies'