about summary refs log tree commit diff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-03-12 08:33:11 +0100
committerGitHub <noreply@github.com>2022-03-12 08:33:11 +0100
commit642528f45513acb823a7291f32fb07377bd2b621 (patch)
treed4cb7bacf88eb19a23fc0feb3a2b605def026212 /.rubocop.yml
parentee8d4dd056e883fdfb955e6305e68390a032ac0d (diff)
Update fix-duplicates maintenance task (#17731)
* Update fix-duplicates task to 2022_02_10_153119

Also add support for Appeal to AccountMerging#merge_with!

* Update fix-duplicates task to 2022_03_07_094650

* Update fix-duplicates task to 2022_03_09_213005

* Update fix-duplicates task to 2022_03_07_083603

* Update fix-duplicates task to 2022_03_10_060626

* Update fix-duplicates script to 2022_03_07_083603

* Update fix-duplicates task to 2022_03_10_060706

* Update fix-duplicates task to 2022_03_10_060959

* Silence CodeClimate
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 68634e9e3..4948aea5a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -29,6 +29,9 @@ Layout/EmptyLineAfterMagicComment:
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true