diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-04 09:35:20 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-04 09:35:20 -0800 |
| commit | cf32a59ed6134d417503448c951b137aeceba81d (patch) | |
| tree | b2d0b21f0796ca39d598579a5bc5996204e8cf08 /railties/lib/rails | |
| parent | e094b8d251550128a2986b9efed7ab725b439546 (diff) | |
| parent | 7d26fad384a99aea27e478474f5b8d24ae33b704 (diff) | |
| download | rails-cf32a59ed6134d417503448c951b137aeceba81d.tar.gz rails-cf32a59ed6134d417503448c951b137aeceba81d.tar.bz2 rails-cf32a59ed6134d417503448c951b137aeceba81d.zip | |
Merge pull request #4298 from rafaelfranca/patch-2
Remove rescue block to require psych gem
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/commands/dbconsole.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index d425c9db6c..6fc127efae 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -1,10 +1,4 @@ require 'erb' - -begin - require 'psych' -rescue LoadError -end - require 'yaml' require 'optparse' require 'rbconfig' |