aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-07-09 21:03:15 -0300
committerGitHub <noreply@github.com>2016-07-09 21:03:15 -0300
commit777ff90ab5da3a7cf8522231270b50c4b29fb15f (patch)
tree034c05d86303d16502f198d2cc33ccf44d5333ba
parent4ff1c221020d793d604ab727a7f1c8fcf7014a59 (diff)
parent724b0833bdf58ac686ca86edc3b05f6007f7077c (diff)
downloadrails-777ff90ab5da3a7cf8522231270b50c4b29fb15f.tar.gz
rails-777ff90ab5da3a7cf8522231270b50c4b29fb15f.tar.bz2
rails-777ff90ab5da3a7cf8522231270b50c4b29fb15f.zip
Merge pull request #25759 from prathamesh-sonpatki/changelog-cleanups
Cleanup CHANGELOGs [ci skip]
-rw-r--r--activerecord/CHANGELOG.md14
-rw-r--r--railties/CHANGELOG.md6
2 files changed, 12 insertions, 8 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 68772499c3..5d04551125 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,11 +1,11 @@
-* Fix the generated `#to_param` method to use `omission:''` so that
+* Fix the generated `#to_param` method to use `omission: ''` so that
the resulting output is actually up to 20 characters, not
effectively 17 to leave room for the default "...".
Also call `#parameterize` before `#truncate` and make the
`separator: /-/` to maximize the information included in the
output.
- Fixes #23635
+ Fixes #23635.
*Rob Biedenharn*
@@ -23,7 +23,7 @@
*Kevin McPhillips*
* Removed the unused methods `ActiveRecord::Base.connection_id` and
- `ActiveRecord::Base.connection_id=`
+ `ActiveRecord::Base.connection_id=`.
*Sean Griffin*
@@ -42,15 +42,15 @@
*Johannes Opper*
-* Introduce ActiveRecord::TransactionSerializationError for catching
+* Introduce `ActiveRecord::TransactionSerializationError` for catching
transaction serialization failures or deadlocks.
*Erol Fornoles*
-* PostgreSQL: Fix db:structure:load silent failure on SQL error
+* PostgreSQL: Fix db:structure:load silent failure on SQL error.
- The command line flag "-v ON_ERROR_STOP=1" should be used
- when invoking psql to make sure errors are not suppressed.
+ The command line flag `-v ON_ERROR_STOP=1` should be used
+ when invoking `psql` to make sure errors are not suppressed.
Example:
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 8a6b5c5cec..f6552a268b 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Set the server host using the `HOST` environment variable.
+
+ *mahnunchik*
+
* Add public API to register new folders for `rake notes`:
config.annotations.register_directories('spec', 'features')
@@ -13,7 +17,7 @@
*Rafael Mendonça França*
* Default `config.assets.quiet = true` in the development environment. Suppress
- logging of `sprockets-rails` requests by default.
+ logging of assets requests by default.
*Kevin McPhillips*