diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 17:30:42 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 18:09:28 +0200 |
| commit | 53b7bb9d047cfc8b21ee0540bd3e5285267160fd (patch) | |
| tree | 30dcf8694eadb68ca8a9579e312f9c38ad8c09d1 /.rubocop.yml | |
| parent | af934b90710a2ce1099d3ceda5de7bcf0e94595c (diff) | |
| parent | 81697997a3fdbb481202a179908958198baaf0dd (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 4f9e09b43..4ba5903bd 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -62,6 +62,9 @@ Metrics/ParameterLists: Metrics/PerceivedComplexity: Max: 20 +Naming/MemoizedInstanceVariableName: + Enabled: false + Rails: Enabled: true @@ -71,6 +74,9 @@ Rails/HasAndBelongsToMany: Rails/SkipsModelValidations: Enabled: false +Rails/HttpStatus: + Enabled: false + Style/ClassAndModuleChildren: Enabled: false |