Skip to content

Commit

Permalink
Merge branch 'master' into pm_disable_rspec-examplewording
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinrobayna authored Apr 10, 2024
2 parents 7a74480 + a73f3bf commit 0ea8f7a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gc_ruboconfig.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Gem::Specification.new do |spec|
spec.name = 'gc_ruboconfig'
spec.version = '4.4.1'
spec.version = '4.4.2'
spec.summary = "GoCardless's shared Rubocop configuration, conforming to our house style"
spec.authors = %w[GoCardless]
spec.homepage = 'https://github.com/gocardless/ruboconfig'
Expand Down
8 changes: 4 additions & 4 deletions rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,16 @@ Rails/TopLevelHashWithIndifferentAccess: # new in 2.16
Rails/WhereMissing: # new in 2.16
Enabled: true

RSpec/Rails/HaveHttpStatus: # new in 2.12
RSpecRails/HaveHttpStatus: # new in 2.12
Enabled: true

RSpec/Rails/AvoidSetupHook:
RSpecRails/AvoidSetupHook:
Enabled: true

RSpec/Rails/HttpStatus:
RSpecRails/HttpStatus:
EnforcedStyle: numeric

RSpec/Rails/InferredSpecType: # new in 2.14
RSpecRails/InferredSpecType: # new in 2.14
Enabled: false

Rails/ActionOrder: # new in 2.17
Expand Down

0 comments on commit 0ea8f7a

Please sign in to comment.