diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-03 13:15:26 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-03 13:15:26 -0500 |
| commit | 2c835a6aacec28e1f72ea44861731eb1364081bd (patch) | |
| tree | ab567f70f69257a9b380a0c6f5e31690f433a7cd /railties | |
| parent | 7e6630329ec071d921b831f379364329ff6916e0 (diff) | |
| parent | 272f7c29e2105f33a6f4131cfaf423bfd05b6040 (diff) | |
| download | rails-2c835a6aacec28e1f72ea44861731eb1364081bd.tar.gz rails-2c835a6aacec28e1f72ea44861731eb1364081bd.tar.bz2 rails-2c835a6aacec28e1f72ea44861731eb1364081bd.zip | |
Merge pull request #14588 from matthewd/kernel_y_with_spring
Explicitly load Kernel#y when starting a console
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/engine.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 5661094d95..c38cc3b5e5 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -430,6 +430,7 @@ module Rails # Check <tt>Rails::Railtie.console</tt> for more info. def load_console(app=self) require "pp" + require "psych/y" require "rails/console/app" require "rails/console/helpers" run_console_blocks(app) |