diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-08-03 17:32:59 -0400 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-08-03 17:32:59 -0400 |
| commit | b76f4e47e842d4f6e4519046461e1a3da99ccf82 (patch) | |
| tree | 195e53b01f17c3b688dec51cddfae2ea629f2468 | |
| parent | 66e5bf9d073633008bb9ef2849c8ac62d66ec7d6 (diff) | |
| download | rails-b76f4e47e842d4f6e4519046461e1a3da99ccf82.tar.gz rails-b76f4e47e842d4f6e4519046461e1a3da99ccf82.tar.bz2 rails-b76f4e47e842d4f6e4519046461e1a3da99ccf82.zip | |
Fix all rubocop violations
| -rw-r--r-- | .rubocop.yml | 5 | ||||
| -rw-r--r-- | activestorage/lib/active_storage/service/disk_service.rb | 6 |
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 = |