Skip to content

Commit

Permalink
Merge pull request #1010 from alphagov/cleanup-rubocop-config
Browse files Browse the repository at this point in the history
Remove redundant RuboCop config
  • Loading branch information
benthorner authored Nov 10, 2021
2 parents b0f91bd + ae1f61e commit e7f45ff
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 25 deletions.
33 changes: 9 additions & 24 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,15 @@ inherit_mode:
merge:
- Exclude

AllCops:
TargetRubyVersion: 2.5
Exclude:
- bin/**/*
- config.ru
- db/schema.rb
- vendor/**/*
- vendor/bundle/**/*

Metrics/BlockLength:
Exclude:
- 'config/routes.rb'
- 'lib/tasks/**/*.rake'
- 'spec/**/*.rb'

Style/FormatStringToken:
Exclude:
- "config/routes.rb"

Rails/OutputSafety:
Enabled: false

Rails/FilePath:
EnforcedStyle: slashes
# **************************************************************
# TRY NOT TO ADD OVERRIDES IN THIS FILE
#
# This repo is configured to follow the RuboCop GOV.UK styleguide.
# Any rules you override here will cause this repo to diverge from
# the way we write code in all other GOV.UK repos.
#
# See https://github.com/alphagov/rubocop-govuk/blob/main/CONTRIBUTING.md
# **************************************************************

Rails/SaveBang:
AllowedReceivers:
Expand Down
2 changes: 1 addition & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@
match "*path",
to: redirect(domain: ENV["CKAN_DOMAIN"], subdomain: "", path: "/%{path}"),
via: :all,
constraints: { path: /(?!#{Regexp.quote(Rails.application.config.assets.prefix[1..-1])}).+/ }
constraints: { path: /(?!#{Regexp.quote(Rails.application.config.assets.prefix[1..])}).+/ }
end
end

0 comments on commit e7f45ff

Please sign in to comment.