From: aescling <11325618-aescling@users.noreply.gitlab.com>
Date: Wed, 16 Nov 2022 03:47:58 +0000 (+0000)
Subject: Make Gemfile.lock consistent with Gemfile
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=71d1047e15abcba99085d2737b9929b1e7f9e03f;p=mastodon.git

Make Gemfile.lock consistent with Gemfile

Not sure how I broke this, which breaks builds on prod.

Fixed with `bundle config unset deployment; bundle install; git add
Gemfile.lock; bundle config set deployment true`.
---

diff --git a/Gemfile.lock b/Gemfile.lock
index c8e5ab26f..03b07a3ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -580,7 +580,7 @@ GEM
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
     rspec-support (3.11.0)
-    rspec_junit_formatter (0.5.1)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (1.33.0)
       json (~> 2.3)
@@ -824,7 +824,7 @@ DEPENDENCIES
   rack-attack (~> 6.6)
   rack-cors (~> 1.1)
   rack-test (~> 2.0)
-  rails (~> 6.1.7)
+  rails (~> 6.1.6)
   rails-controller-testing (~> 1.0)
   rails-i18n (~> 6.0)
   rails-settings-cached (~> 0.6)
@@ -836,7 +836,7 @@ DEPENDENCIES
   rqrcode (~> 2.1)
   rspec-rails (~> 5.1)
   rspec-sidekiq (~> 3.1)
-  rspec_junit_formatter (~> 0.5)
+  rspec_junit_formatter (~> 0.6)
   ruby-progressbar (~> 1.11)
   sanitize (~> 6.0)
   scenic (~> 1.6)