From 761b049b2e51a035eaf9c18f4d0200409848a28e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 4 Jan 2012 13:30:57 -0300 Subject: No need to use rescue block to require psych --- railties/lib/rails/commands/dbconsole.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'railties') diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index d425c9db6c..d71e7f5271 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -1,10 +1,5 @@ require 'erb' - -begin - require 'psych' -rescue LoadError -end - +require 'psych' require 'yaml' require 'optparse' require 'rbconfig' -- cgit v1.2.3 From 7d26fad384a99aea27e478474f5b8d24ae33b704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 4 Jan 2012 14:29:13 -0300 Subject: No need to require psych since require yaml does that. --- railties/lib/rails/commands/dbconsole.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'railties') 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' -- cgit v1.2.3