aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-08-03 17:42:35 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-08-03 17:45:58 -0400
commit77be872819d6e9fd63f4253398dbfd6990166a7c (patch)
treea50d67e6c0eaf2da98b695520036d43a6ac578b8
parent762c7da7832c5641e19e6eb44b0b443ab67b1400 (diff)
downloadrails-77be872819d6e9fd63f4253398dbfd6990166a7c.tar.gz
rails-77be872819d6e9fd63f4253398dbfd6990166a7c.tar.bz2
rails-77be872819d6e9fd63f4253398dbfd6990166a7c.zip
Do not change the entire codebase style only because of active_storage
We are already removing the braces around hash parameters in the last argument in other places so we should not change the entire codebase because of two places.
-rw-r--r--.rubocop.yml1
-rw-r--r--activestorage/lib/active_storage/service/disk_service.rb6
2 files changed, 2 insertions, 5 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index cec4fcc71a..2889acfdd1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,7 +16,6 @@ Style/AndOr:
# method call.
Style/BracesAroundHashParameters:
Enabled: true
- EnforcedStyle: context_dependent
# Align `when` with `case`.
Layout/CaseIndentation:
diff --git a/activestorage/lib/active_storage/service/disk_service.rb b/activestorage/lib/active_storage/service/disk_service.rb
index c75c1caabe..35b0909297 100644
--- a/activestorage/lib/active_storage/service/disk_service.rb
+++ b/activestorage/lib/active_storage/service/disk_service.rb
@@ -81,10 +81,8 @@ 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 =