diff options
| author | claudiob <claudiob@gmail.com> | 2014-11-28 18:38:08 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 15:54:21 -0300 |
| commit | 185d7cdb429764c50fb62035fa918b7ba0a71fae (patch) | |
| tree | b67bbea90c3175a7a382c3221dd92c1bd2140532 /railties | |
| parent | 7926ab1004d2ec9118516445d32c75c9aaacba79 (diff) | |
| download | rails-185d7cdb429764c50fb62035fa918b7ba0a71fae.tar.gz rails-185d7cdb429764c50fb62035fa918b7ba0a71fae.tar.bz2 rails-185d7cdb429764c50fb62035fa918b7ba0a71fae.zip | |
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.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application.rb | 11 |
1 files changed, 1 insertions, 10 deletions
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 |