From 185d7cdb429764c50fb62035fa918b7ba0a71fae Mon Sep 17 00:00:00 2001 From: claudiob Date: Fri, 28 Nov 2014 18:38:08 -0800 Subject: Remove Psych hack for Ruby 1.9 A special `if` statement to support `Psych` for Ruby < 2.0 can be dropped now that Rails requires Ruby >= 2.0. --- railties/lib/rails/application.rb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'railties') diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index ad8b52a39f..8da73db821 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -420,16 +420,7 @@ module Rails console do unless ::Kernel.private_method_defined?(:y) - if RUBY_VERSION >= '2.0' - require "psych/y" - else - module ::Kernel - def y(*objects) - puts ::Psych.dump_stream(*objects) - end - private :y - end - end + require "psych/y" end end -- cgit v1.2.3