From: Tom Hughes <tom@compton.nu>
Date: Wed, 19 Jun 2024 19:41:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4913'
X-Git-Tag: live~757
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5aa4d49281c92feb56a520701c28ae4f52a7fea6?hp=d57dd1f4da4d4605f534607b69944e3c977e4db5

Merge remote-tracking branch 'upstream/pull/4913'
---

diff --git a/.rubocop.yml b/.rubocop.yml
index 1e18afd83..c0f0c1fa0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -45,6 +45,10 @@ Naming/FileName:
 Naming/MethodParameterName:
   Enabled: false
 
+# This conflicts with Strong Migrations, which can't check `change_table`
+Rails/BulkChangeTable:
+  Enabled: false
+
 Rails/CreateTableWithTimestamps:
   Enabled: false