aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-02-01 08:42:22 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2015-02-01 08:42:22 -0800
commitaa8ade5811db1873a6091f3aa6282e77d22d9d3e (patch)
treeae6272f67eddcc6293579542c6e1e8dc993bd30f /guides
parent82e710f8471622bd3f3d1640e42ad14f9c9309b9 (diff)
parentfdeef19833ce47b03bcb792f1850f6233f050b9f (diff)
downloadrails-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 'guides')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index d7fbe575c2..909a92b9dd 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -534,7 +534,7 @@ module FixtureFileHelpers
Digest::SHA2.hexdigest(File.read(Rails.root.join('test/fixtures', path)))
end
end
-ActiveRecord::FixtureSet.context_class.send :include, FixtureFileHelpers
+ActiveRecord::FixtureSet.context_class.include FixtureFileHelpers
```
### I18n enforcing available locales