From: Tom Hughes <tom@compton.nu>
Date: Thu, 20 Aug 2020 18:08:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2784'
X-Git-Tag: live~2099
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dc51702b902a4cc1ef78a7f0f5d6b7b221f37094?hp=685561687022262a1af5fc09c5617757d8529f3c

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 7ecd0abe3..5fca661e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -119,7 +119,7 @@ GEM
     bzip2-ffi (1.0.0)
       ffi (~> 1.0)
     cancancan (3.1.0)
-    canonical-rails (0.2.8)
+    canonical-rails (0.2.9)
       rails (>= 4.1, < 6.1)
     capybara (3.33.0)
       addressable