about summary refs log tree commit diff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-27 20:20:49 +0200
committerGitHub <noreply@github.com>2018-08-27 20:20:49 +0200
commit8852fff3a43ea4ac26aef5c7f0d72f3db3b421a0 (patch)
tree30dcf8694eadb68ca8a9579e312f9c38ad8c09d1 /.rubocop.yml
parentaf934b90710a2ce1099d3ceda5de7bcf0e94595c (diff)
parent53b7bb9d047cfc8b21ee0540bd3e5285267160fd (diff)
Merge pull request #675 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml6
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