From 45f57640b50f6d7bca038a6d98cf7d9c31bc86e7 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <heinrich@gitlab.com>
Date: Wed, 3 Aug 2022 14:45:51 +0800
Subject: [PATCH] Upgrade gems for Rails 7 support
Upgrade dependencies to prepare us for the Rails 7 upgrade
---
Gemfile | 6 +++---
Gemfile.lock | 24 ++++++++++++------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Gemfile b/Gemfile
index eed4dce236151..e4e5ba077493b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -237,7 +237,7 @@ gem 'redis', '~> 4.4.0'
gem 'connection_pool', '~> 2.0'
# Redis session store
-gem 'redis-actionpack', '~> 5.2.0'
+gem 'redis-actionpack', '~> 5.3.0'
# Discord integration
gem 'discordrb-webhooks', '~> 3.4', require: false
@@ -317,7 +317,7 @@ gem 'pg_query', '~> 2.1.0'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.23.0'
+gem 'gitlab-labkit', '~> 0.24.0'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0'
@@ -360,7 +360,7 @@ end
group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false
- gem 'bullet', '~> 6.1.3'
+ gem 'bullet', '~> 7.0.2'
gem 'pry-byebug'
gem 'pry-rails', '~> 0.3.9'
gem 'pry-shell', '~> 0.5.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index e029123b3ebd2..54c3ce6bc13be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -191,7 +191,7 @@ GEM
activemodel (>= 5.0)
browser (4.2.0)
builder (3.2.4)
- bullet (6.1.3)
+ bullet (7.0.2)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
bundler-audit (0.7.0.1)
@@ -521,9 +521,9 @@ GEM
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
- gitlab-labkit (0.23.0)
- actionpack (>= 5.0.0, < 7.0.0)
- activesupport (>= 5.0.0, < 7.0.0)
+ gitlab-labkit (0.24.0)
+ actionpack (>= 5.0.0, < 8.0.0)
+ activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
jaeger-client (~> 1.1.0)
opentracing (~> 0.4)
@@ -1093,16 +1093,16 @@ GEM
recursive-open-struct (1.1.3)
redcarpet (3.5.1)
redis (4.4.0)
- redis-actionpack (5.2.0)
- actionpack (>= 5, < 7)
+ redis-actionpack (5.3.0)
+ actionpack (>= 5, < 8)
redis-rack (>= 2.1.0, < 3)
redis-store (>= 1.1.0, < 2)
redis-namespace (1.8.1)
redis (>= 3.0.4)
- redis-rack (2.1.3)
+ redis-rack (2.1.4)
rack (>= 2.0.8, < 3)
redis-store (>= 1.2, < 2)
- redis-store (1.9.0)
+ redis-store (1.9.1)
redis (>= 4, < 5)
regexp_parser (2.5.0)
regexp_property_values (1.0.0)
@@ -1413,7 +1413,7 @@ GEM
unf_ext (0.0.8)
unicode-display_width (1.8.0)
unicode_utils (1.4.0)
- uniform_notifier (1.13.0)
+ uniform_notifier (1.16.0)
unleash (3.2.2)
murmurhash3 (~> 0.1.6)
unparser (0.6.0)
@@ -1509,7 +1509,7 @@ DEPENDENCIES
bootsnap (~> 1.13.0)
bootstrap_form (~> 4.2.0)
browser (~> 4.2)
- bullet (~> 6.1.3)
+ bullet (~> 7.0.2)
bundler-audit (~> 0.7.0.1)
capybara (~> 3.35.3)
capybara-screenshot (~> 1.0.22)
@@ -1572,7 +1572,7 @@ DEPENDENCIES
gitlab-dangerfiles (~> 3.5.0)
gitlab-experiment (~> 0.7.1)
gitlab-fog-azure-rm (~> 1.3.0)
- gitlab-labkit (~> 0.23.0)
+ gitlab-labkit (~> 0.24.0)
gitlab-license (~> 2.2.0)
gitlab-license_finder (~> 6.0)
gitlab-mail_room (~> 0.0.9)
@@ -1693,7 +1693,7 @@ DEPENDENCIES
re2 (~> 1.4.0)
recaptcha (~> 4.11)
redis (~> 4.4.0)
- redis-actionpack (~> 5.2.0)
+ redis-actionpack (~> 5.3.0)
redis-namespace (~> 1.8.1)
request_store (~> 1.5)
responders (~> 3.0)
--
GitLab