Skip to content

Commit

Permalink
Unify to use 4 spaces indentation in CHANGELOGs [ci skip]
Browse files Browse the repository at this point in the history
Especially, somehow `CHANGELOG.md` in actiontext and activestorage in
master branch had used 3 spaces indentation.
  • Loading branch information
kamipo committed Jun 4, 2019
1 parent 502bfde commit cc27e99
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 63 deletions.
5 changes: 3 additions & 2 deletions actionmailbox/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
8 changes: 5 additions & 3 deletions actionpack/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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*

Expand All @@ -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.
26 changes: 13 additions & 13 deletions actiontext/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
# <trix-editor id="message_content" ...></trix-editor>
fill_in_rich_text_area "message_content", with: "Hello <em>world!</em>"
```ruby
# <trix-editor id="message_content" ...></trix-editor>
fill_in_rich_text_area "message_content", with: "Hello <em>world!</em>"

# <trix-editor placeholder="Your message here" ...></trix-editor>
fill_in_rich_text_area "Your message here", with: "Hello <em>world!</em>"
# <trix-editor placeholder="Your message here" ...></trix-editor>
fill_in_rich_text_area "Your message here", with: "Hello <em>world!</em>"

# <trix-editor aria-label="Message content" ...></trix-editor>
fill_in_rich_text_area "Message content", with: "Hello <em>world!</em>"
# <trix-editor aria-label="Message content" ...></trix-editor>
fill_in_rich_text_area "Message content", with: "Hello <em>world!</em>"

# <input id="trix_input_1" name="message[content]" type="hidden">
# <trix-editor input="trix_input_1"></trix-editor>
fill_in_rich_text_area "message[content]", with: "Hello <em>world!</em>"
```
# <input id="trix_input_1" name="message[content]" type="hidden">
# <trix-editor input="trix_input_1"></trix-editor>
fill_in_rich_text_area "message[content]", with: "Hello <em>world!</em>"
```

*George Claghorn*
*George Claghorn*


Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actiontext/CHANGELOG.md) for previous changes.
9 changes: 5 additions & 4 deletions activerecord/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
83 changes: 42 additions & 41 deletions activestorage/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit cc27e99

Please sign in to comment.