From: Tom Hughes <tom@compton.nu>
Date: Wed, 31 May 2023 17:38:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4054'
X-Git-Tag: live~1728
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/02cfc8977192b1334afdbdf24e203e5da4da362e?hp=d238a90244f6706dacbb18576243a4c1f650c080

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

diff --git a/.gitignore b/.gitignore
index 75e9eb59e..e5866532e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *~
 .DS_Store
+.bundle/config
 .idea
 .ruby-gemset
 .ruby-version