From cc27e9988f9ce4e52acf491a5f67be70ab7d25d8 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Wed, 5 Jun 2019 05:47:33 +0900 Subject: Unify to use 4 spaces indentation in CHANGELOGs [ci skip] Especially, somehow `CHANGELOG.md` in actiontext and activestorage in master branch had used 3 spaces indentation. --- actionmailbox/CHANGELOG.md | 5 +-- actionpack/CHANGELOG.md | 8 +++-- actiontext/CHANGELOG.md | 26 +++++++-------- activerecord/CHANGELOG.md | 9 ++--- activestorage/CHANGELOG.md | 83 +++++++++++++++++++++++----------------------- 5 files changed, 68 insertions(+), 63 deletions(-) diff --git a/actionmailbox/CHANGELOG.md b/actionmailbox/CHANGELOG.md index 605a38b06b..bca3d1d9ed 100644 --- a/actionmailbox/CHANGELOG.md +++ b/actionmailbox/CHANGELOG.md @@ -1,5 +1,6 @@ -* Add `ApplicationMailbox.mailbox_for` to expose mailbox routing. +* Add `ApplicationMailbox.mailbox_for` to expose mailbox routing. + + *James Dabbs* - *James Dabbs* Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionmailbox/CHANGELOG.md) for previous changes. diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 4bcf313ecc..55592585ea 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,11 +1,11 @@ -* Keep part when scope option has value +* Keep part when scope option has value. When a route was defined within an optional scope, if that route didn't take parameters the scope was lost when using path helpers. This commit ensures scope is kept both when the route takes parameters or when it doesn't. - Fixes #33219 + Fixes #33219. *Alberto Almagro* @@ -18,8 +18,10 @@ *Eugene Kenny* -* Fix strong parameters blocks all attributes even when only some keys are invalid (non-numerical). It should only block invalid key's values instead. +* Fix strong parameters blocks all attributes even when only some keys are invalid (non-numerical). + It should only block invalid key's values instead. *Stan Lo* + Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionpack/CHANGELOG.md) for previous changes. diff --git a/actiontext/CHANGELOG.md b/actiontext/CHANGELOG.md index 9a314db75c..d28799279f 100644 --- a/actiontext/CHANGELOG.md +++ b/actiontext/CHANGELOG.md @@ -1,21 +1,21 @@ -* The `fill_in_rich_text_area` system test helper locates a Trix editor and fills it in with the given HTML: +* The `fill_in_rich_text_area` system test helper locates a Trix editor and fills it in with the given HTML: - ```ruby - # - fill_in_rich_text_area "message_content", with: "Hello world!" + ```ruby + # + fill_in_rich_text_area "message_content", with: "Hello world!" - # - fill_in_rich_text_area "Your message here", with: "Hello world!" + # + fill_in_rich_text_area "Your message here", with: "Hello world!" - # - fill_in_rich_text_area "Message content", with: "Hello world!" + # + fill_in_rich_text_area "Message content", with: "Hello world!" - # - # - fill_in_rich_text_area "message[content]", with: "Hello world!" - ``` + # + # + fill_in_rich_text_area "message[content]", with: "Hello world!" + ``` - *George Claghorn* + *George Claghorn* Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actiontext/CHANGELOG.md) for previous changes. diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 7cc9ee92c2..09fdc66788 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -2,18 +2,19 @@ *Martin R. Schuster* -* Fix invalid schema when primary key column has a comment +* Fix invalid schema when primary key column has a comment. - Fixes #29966 + Fixes #29966. *Guilherme Goettems Schneider* -* Fix table comment also being applied to the primary key column +* Fix table comment also being applied to the primary key column. *Guilherme Goettems Schneider* * Allow generated `create_table` migrations to include or skip timestamps. - *Michael Duchemin* + *Michael Duchemin* + Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/activerecord/CHANGELOG.md) for previous changes. diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md index 2d9fe56858..fdb0f143f4 100644 --- a/activestorage/CHANGELOG.md +++ b/activestorage/CHANGELOG.md @@ -1,59 +1,60 @@ -* Image analysis is skipped if ImageMagick returns an error. +* Image analysis is skipped if ImageMagick returns an error. - `ActiveStorage::Analyzer::ImageAnalyzer#metadata` would previously raise a - `MiniMagick::Error`, which caused persistent `ActiveStorage::AnalyzeJob` - failures. It now logs the error and returns `{}`, resulting in no metadata - being added to the offending image blob. + `ActiveStorage::Analyzer::ImageAnalyzer#metadata` would previously raise a + `MiniMagick::Error`, which caused persistent `ActiveStorage::AnalyzeJob` + failures. It now logs the error and returns `{}`, resulting in no metadata + being added to the offending image blob. - *George Claghorn* + *George Claghorn* -* Method calls on singular attachments return `nil` when no file is attached. +* Method calls on singular attachments return `nil` when no file is attached. - Previously, assuming the following User model, `user.avatar.filename` would - raise a `Module::DelegationError` if no avatar was attached: + Previously, assuming the following User model, `user.avatar.filename` would + raise a `Module::DelegationError` if no avatar was attached: - ```ruby - class User < ApplicationRecord - has_one_attached :avatar - end - ``` + ```ruby + class User < ApplicationRecord + has_one_attached :avatar + end + ``` - They now return `nil`. + They now return `nil`. - *Matthew Tanous* + *Matthew Tanous* -* The mirror service supports direct uploads. +* The mirror service supports direct uploads. - New files are directly uploaded to the primary service. When a - directly-uploaded file is attached to a record, a background job is enqueued - to copy it to each secondary service. + New files are directly uploaded to the primary service. When a + directly-uploaded file is attached to a record, a background job is enqueued + to copy it to each secondary service. - Configure the queue used to process mirroring jobs by setting - `config.active_storage.queues.mirror`. The default is `:active_storage_mirror`. + Configure the queue used to process mirroring jobs by setting + `config.active_storage.queues.mirror`. The default is `:active_storage_mirror`. - *George Claghorn* + *George Claghorn* -* The S3 service now permits uploading files larger than 5 gigabytes. +* The S3 service now permits uploading files larger than 5 gigabytes. - When uploading a file greater than 100 megabytes in size, the service - transparently switches to [multipart uploads](https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html) - using a part size computed from the file's total size and S3's part count limit. + When uploading a file greater than 100 megabytes in size, the service + transparently switches to [multipart uploads](https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html) + using a part size computed from the file's total size and S3's part count limit. - No application changes are necessary to take advantage of this feature. You - can customize the default 100 MB multipart upload threshold in your S3 - service's configuration: + No application changes are necessary to take advantage of this feature. You + can customize the default 100 MB multipart upload threshold in your S3 + service's configuration: - ```yaml - production: - service: s3 - access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> - secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> - region: us-east-1 - bucket: my-bucket - upload: - multipart_threshold: <%= 250.megabytes %> - ``` + ```yaml + production: + service: s3 + access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> + secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> + region: us-east-1 + bucket: my-bucket + upload: + multipart_threshold: <%= 250.megabytes %> + ``` + + *George Claghorn* - *George Claghorn* Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/activestorage/CHANGELOG.md) for previous changes. -- cgit v1.2.3