diff --git a/debian/control b/debian/control index 0f208ff4b2..d4d606047a 100644 --- a/debian/control +++ b/debian/control @@ -178,7 +178,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-sidekiq (>= 5.2.7~), ruby-sidekiq-cron (>= 1.0~), ruby-redis-namespace (>= 1.6~), - ruby-gitlab-sidekiq-fetcher (>= 0.5.2~), + ruby-gitlab-sidekiq-fetcher (>= 0.6.1~), # Cron Parser ruby-fugit (>= 1.2.1~), # HTTP requests diff --git a/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch b/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch new file mode 100644 index 0000000000..1884a9d1af --- /dev/null +++ b/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch @@ -0,0 +1,13 @@ +Allow newer version in the archive to satisfy the requirement + +--- a/Gemfile ++++ b/Gemfile +@@ -179,7 +179,7 @@ + gem 'sidekiq', '~> 5.2', '>= 5.2.7' + gem 'sidekiq-cron', '~> 1.0' + gem 'redis-namespace', '~> 1.6' +-gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch' ++gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch' + + # Cron Parser + gem 'fugit', '~> 1.2', '>= 1.2.1' diff --git a/debian/patches/series b/debian/patches/series index 3107ccd3e5..aaef394cbc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,6 +11,7 @@ 0480-embed-faraday-middleware-aws-signers-v4.patch 0482-remove-ee-only-gems.patch 0484-relax-grape-entity.patch +0485-relax-gitlab-sidekiq-fetcher.patch 0500-set-webpack-root.patch 0510-remove-dev-dependencies.patch 0520-add-system-lib-path-for-webpack.patch