aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activerecord/CHANGELOG.md28
-rw-r--r--activerecord/test/cases/attribute_methods_test.rb2
-rw-r--r--guides/source/4_2_release_notes.md2
-rw-r--r--guides/source/active_job_basics.md2
-rw-r--r--guides/source/configuring.md2
-rw-r--r--guides/source/debugging_rails_applications.md2
-rw-r--r--railties/CHANGELOG.md2
-rw-r--r--railties/lib/rails/application.rb2
8 files changed, 22 insertions, 20 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 910cf00ac0..c02de2e979 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -43,7 +43,7 @@
*Girish Sonawane*
-* Introduce `connection.supports_views?` to check wether the current adapter
+* Introduce `connection.supports_views?` to check whether the current adapter
has support for SQL views. Connection adapters should define this method.
*Yves Senn*
@@ -91,17 +91,18 @@
*Agis Anastasopoulos*
-* Fixed the `Relation#exists?` to work with polymorphic associations.
+* Fixed `Relation#exists?` to work with polymorphic associations.
Fixes #15821.
*Kassio Borges*
-* Currently, Active Record will rescue any errors raised within
- after_rollback/after_create callbacks and print them to the logs. Next versions of rails
- will not rescue those errors anymore, and just bubble them up, as the other callbacks.
+* Currently, Active Record rescues any errors raised within
+ `after_rollback`/`after_create` callbacks and prints them to the logs.
+ Future versions of Rails will not rescue these errors anymore and
+ just bubble them up like the other callbacks.
- This adds a opt-in flag to enable that behaviour, of not rescuing the errors.
+ This commit adds an opt-in flag to enable not rescuing the errors.
Example:
@@ -125,7 +126,7 @@
*Sean Griffin*
-* Fix regression on `after_commit` that didnt fire when having nested transactions.
+* Fix regression on `after_commit` that did not fire with nested transactions.
Fixes #16425.
@@ -161,9 +162,9 @@
* Define `id_was` to get the previous value of the primary key.
- Currently when we call id_was and we have a custom primary key name
+ Currently when we call `id_was` and we have a custom primary key name,
Active Record will return the current value of the primary key. This
- make impossible to correctly do an update operation if you change the
+ makes it impossible to correctly do an update operation if you change the
id.
Fixes #16413.
@@ -195,7 +196,7 @@
*Eileen M. Uchtitelle*, *Aaron Patterson*
-* No verbose backtrace by db:drop when database does not exist.
+* No verbose backtrace by `db:drop` when database does not exist.
Fixes #16295.
@@ -240,7 +241,7 @@
*Stefan Kanev*
-* Dont swallow errors on `compute_type` when having a bad `alias_method` on
+* Do not swallow errors on `compute_type` when having a bad `alias_method` on
a class.
*arthurnn*
@@ -363,8 +364,9 @@
* Detect in-place modifications on String attributes.
- Before this change user have to mark the attribute as changed to it be persisted
- in the database. Now it is not required anymore.
+ Before this change, an attribute modified in-place had to be marked as
+ changed in order for it to be persisted in the database. Now it is no longer
+ required.
Before:
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 153f870e3d..b42cc3a173 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -734,7 +734,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
assert_raise(ActiveRecord::UnknownAttributeError) { @target.new.attributes = { :title => "Ants in pants" } }
end
- def test_bulk_update_raise_unknown_attribute_errro
+ def test_bulk_update_raise_unknown_attribute_error
error = assert_raises(ActiveRecord::UnknownAttributeError) {
@target.new(:hello => "world")
}
diff --git a/guides/source/4_2_release_notes.md b/guides/source/4_2_release_notes.md
index 905db00d5c..19d61e6f3f 100644
--- a/guides/source/4_2_release_notes.md
+++ b/guides/source/4_2_release_notes.md
@@ -337,7 +337,7 @@ Please refer to the [Changelog][railties] for detailed changes.
namespace: my_app_development
# config/production.rb
- MyApp::Application.configure do
+ Rails.application.configure do
config.middleware.use ExceptionNotifier, config_for(:exception_notification)
end
```
diff --git a/guides/source/active_job_basics.md b/guides/source/active_job_basics.md
index 7b3081993d..f2831defe6 100644
--- a/guides/source/active_job_basics.md
+++ b/guides/source/active_job_basics.md
@@ -138,7 +138,7 @@ You can easily change your adapter:
```ruby
# be sure to have the adapter gem in your Gemfile and follow the adapter specific
# installation and deployment instructions
-YourApp::Application.config.active_job.queue_adapter = :sidekiq
+Rails.application.config.active_job.queue_adapter = :sidekiq
```
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 667281d1aa..220946e8d5 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -108,7 +108,7 @@ numbers. New applications filter out passwords by adding the following `config.f
* `config.log_formatter` defines the formatter of the Rails logger. This option defaults to an instance of `ActiveSupport::Logger::SimpleFormatter` for all modes except production, where it defaults to `Logger::Formatter`.
-* `config.log_level` defines the verbosity of the Rails logger. This option defaults to `:debug` for all modes except production, where it defaults to `:info`.
+* `config.log_level` defines the verbosity of the Rails logger. This option defaults to `:debug` for all environments.
* `config.log_tags` accepts a list of methods that the `request` object responds to. This makes it easy to tag log lines with debug information like subdomain and request id - both very helpful in debugging multi-user production applications.
diff --git a/guides/source/debugging_rails_applications.md b/guides/source/debugging_rails_applications.md
index 88c6210296..1a647f8375 100644
--- a/guides/source/debugging_rails_applications.md
+++ b/guides/source/debugging_rails_applications.md
@@ -138,7 +138,7 @@ Rails.logger.level = 0 # at any time
This is useful when you want to log under development or staging, but you don't want to flood your production log with unnecessary information.
-TIP: The default Rails log level is `info` in production mode and `debug` in development and test mode.
+TIP: The default Rails log level is `debug` in all environments.
### Sending Messages
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0543b57ad4..2e7f134101 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -73,7 +73,7 @@
namespace: my_app_development
# config/production.rb
- MyApp::Application.configure do
+ Rails.application.configure do
config.middleware.use ExceptionNotifier, config_for(:exception_notification)
end
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 67d5bac700..bc966e87c6 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -217,7 +217,7 @@ module Rails
# namespace: my_app_development
#
# # config/production.rb
- # MyApp::Application.configure do
+ # Rails.application.configure do
# config.middleware.use ExceptionNotifier, config_for(:exception_notification)
# end
def config_for(name)