diff options
| author | Matt Jankowski <matt@jankowski.online> | 2024-04-19 16:32:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-19 20:32:26 +0000 |
| commit | 8d47ba893a714a52183b57be83eb38bcb7ffef57 (patch) | |
| tree | 583f4974b601f0ffa9b4b273a6b8b16f91981aa1 | |
| parent | d24462c81adbf289077f70e6f836b82d3adf5cb4 (diff) | |
Fix `Style/PercentLiteralDelimiters` cop (#30006)
| -rw-r--r-- | .rubocop_todo.yml | 7 | ||||
| -rw-r--r-- | config/deploy.rb | 4 | ||||
| -rw-r--r-- | config/initializers/doorkeeper.rb | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 9ca7ba6f115..ac65c158953 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -197,13 +197,6 @@ Style/OptionalBooleanParameter: - 'app/workers/unfollow_follow_worker.rb' - 'lib/mastodon/redis_config.rb' -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: PreferredDelimiters. -Style/PercentLiteralDelimiters: - Exclude: - - 'config/deploy.rb' - - 'config/initializers/doorkeeper.rb' - # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: EnforcedStyle. # SupportedStyles: short, verbose diff --git a/config/deploy.rb b/config/deploy.rb index 75bfcc26f4a..28c83877069 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -13,8 +13,8 @@ set :migration_role, :app append :linked_files, '.env.production', 'public/robots.txt' append :linked_dirs, 'vendor/bundle', 'node_modules', 'public/system' -SYSTEMD_SERVICES = %i[sidekiq streaming web].freeze -SERVICE_ACTIONS = %i[reload restart status].freeze +SYSTEMD_SERVICES = %i(sidekiq streaming web).freeze +SERVICE_ACTIONS = %i(reload restart status).freeze namespace :systemd do SYSTEMD_SERVICES.each do |service| diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index f9d47a205cc..428e4739139 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -150,7 +150,7 @@ Doorkeeper.configure do # # You can use this option in order to forbid URI's with 'javascript' scheme # for example. - forbid_redirect_uri { |uri| %w[data vbscript javascript].include?(uri.scheme.to_s.downcase) } + forbid_redirect_uri { |uri| %w(data vbscript javascript).include?(uri.scheme.to_s.downcase) } # Specify what grant flows are enabled in array of Strings. The valid # strings and the flows they enable are: |