diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-02-01 08:42:22 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-02-01 08:42:22 -0800 |
| commit | aa8ade5811db1873a6091f3aa6282e77d22d9d3e (patch) | |
| tree | ae6272f67eddcc6293579542c6e1e8dc993bd30f /railties/lib/rails/commands | |
| parent | 82e710f8471622bd3f3d1640e42ad14f9c9309b9 (diff) | |
| parent | fdeef19833ce47b03bcb792f1850f6233f050b9f (diff) | |
| download | rails-aa8ade5811db1873a6091f3aa6282e77d22d9d3e.tar.gz rails-aa8ade5811db1873a6091f3aa6282e77d22d9d3e.tar.bz2 rails-aa8ade5811db1873a6091f3aa6282e77d22d9d3e.zip | |
Merge branch 'master' into mdluo-master
* master:
Move required error message and changelog to Active Record
Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846
Use Module#include instead of send :include, since now is a public method [ci skip]
:scissors: warning from controller renderer test
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/console.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb index 35a815a34f..5d37a2b699 100644 --- a/railties/lib/rails/commands/console.rb +++ b/railties/lib/rails/commands/console.rb @@ -79,7 +79,7 @@ module Rails end if defined?(console::ExtendCommandBundle) - console::ExtendCommandBundle.send :include, Rails::ConsoleMethods + console::ExtendCommandBundle.include(Rails::ConsoleMethods) end console.start end |