aboutsummaryrefslogtreecommitdiff
path: root/www/gitlab-ce/files/patch-Gemfile
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab-ce/files/patch-Gemfile')
-rw-r--r--www/gitlab-ce/files/patch-Gemfile13
1 files changed, 11 insertions, 2 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index db38faea6542..3e6bc6165173 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2024-01-24 16:26:54 UTC
+--- Gemfile.orig 2024-02-07 07:58:11 UTC
+++ Gemfile
@@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss
@@ -41,7 +41,16 @@
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -392,134 +392,15 @@ gem 'prometheus-client-mmap', '~> 1.1', require: 'prom
+@@ -252,7 +252,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco
+ gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory
+
+ # Background jobs
+-gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'sidekiq', '~> 7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory
+ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared
+ gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory
+
+@@ -392,134 +392,15 @@ gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', re
gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory