aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop.yml5
-rw-r--r--activestorage/lib/active_storage/service/disk_service.rb6
2 files changed, 5 insertions, 6 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 0408ca4aa1..cec4fcc71a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,6 +16,7 @@ Style/AndOr:
# method call.
Style/BracesAroundHashParameters:
Enabled: true
+ EnforcedStyle: context_dependent
# Align `when` with `case`.
Layout/CaseIndentation:
@@ -28,10 +29,6 @@ Layout/CommentIndentation:
Layout/EmptyLineAfterMagicComment:
Enabled: true
-# No extra empty lines.
-Layout/EmptyLines:
- Enabled: true
-
# In a regular class definition, no empty lines around the body.
Layout/EmptyLinesAroundClassBody:
Enabled: true
diff --git a/activestorage/lib/active_storage/service/disk_service.rb b/activestorage/lib/active_storage/service/disk_service.rb
index 35b0909297..c75c1caabe 100644
--- a/activestorage/lib/active_storage/service/disk_service.rb
+++ b/activestorage/lib/active_storage/service/disk_service.rb
@@ -81,8 +81,10 @@ class ActiveStorage::Service::DiskService < ActiveStorage::Service
content_length: content_length,
checksum: checksum
},
- expires_in: expires_in,
- purpose: :blob_token
+ {
+ expires_in: expires_in,
+ purpose: :blob_token
+ }
)
generated_url =