diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch index e90f7f6ee6..6433f8c5e4 100644 --- a/debian/patches/0050-relax-stable-libs.patch +++ b/debian/patches/0050-relax-stable-libs.patch @@ -3,7 +3,7 @@ gitlab Gemfile --- a/Gemfile +++ b/Gemfile -@@ -1,16 +1,16 @@ +@@ -1,52 +1,52 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.0.3.1' @@ -24,9 +24,28 @@ gitlab Gemfile # Supported DBs gem 'pg', '~> 1.1' -@@ -30,23 +30,23 @@ + + gem 'rugged', '~> 0.28' +-gem 'grape-path-helpers', '~> 1.6.1' ++gem 'grape-path-helpers', '~> 1.6', '>= 1.6.1' + + gem 'faraday', '~> 1.0' +-gem 'marginalia', '~> 1.10.0' ++gem 'marginalia', '~> 1.10' + + # Authentication libraries +-gem 'devise', '~> 4.7.2' ++gem 'devise', '~> 4.7', '>= 4.7.2' + # TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828) +-gem 'bcrypt', '3.1.12' +-gem 'doorkeeper', '~> 5.3.0' +-gem 'doorkeeper-openid_connect', '~> 1.7.4' ++gem 'bcrypt', '~> 3.1', '>= 3.1.12' ++gem 'doorkeeper', '~> 5.3' ++gem 'doorkeeper-openid_connect', '~> 1.7', '>= 1.7.4' gem 'omniauth', '~> 1.8' - gem 'omniauth-auth0', '~> 2.0.0' +-gem 'omniauth-auth0', '~> 2.0.0' ++gem 'omniauth-auth0', '~> 2.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' -gem 'omniauth-cas3', '~> 1.1.4' -gem 'omniauth-facebook', '~> 4.0.0' @@ -294,7 +313,7 @@ gitlab Gemfile gem 'addressable', '~> 2.7' gem 'gemojione', '~> 3.3' -@@ -295,7 +295,7 @@ +@@ -295,18 +295,18 @@ gem "gitlab-license", "~> 1.0" # Protect against bruteforcing @@ -303,9 +322,10 @@ gitlab Gemfile # Sentry integration gem 'sentry-raven', '~> 3.0' -@@ -303,10 +303,10 @@ + # PostgreSQL query parsing - gem 'pg_query', '~> 1.3.0' +-gem 'pg_query', '~> 1.3.0' ++gem 'pg_query', '~> 1.3' -gem 'premailer-rails', '~> 1.10.3' +gem 'premailer-rails', '~> 1.10', '>= 1.10.3' diff --git a/debian/patches/0499-80-relax-bcrypt.patch b/debian/patches/0499-80-relax-bcrypt.patch deleted file mode 100644 index 44a9d6183c..0000000000 --- a/debian/patches/0499-80-relax-bcrypt.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Gemfile -+++ b/Gemfile -@@ -23,8 +23,7 @@ - - # Authentication libraries - gem 'devise', '~> 4.7.2' --# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828) --gem 'bcrypt', '3.1.12' -+gem 'bcrypt', '~> 3.1', '>= 3.1.14' - gem 'doorkeeper', '~> 5.3.0' - gem 'doorkeeper-openid_connect', '~> 1.7.4' - gem 'omniauth', '~> 1.8' diff --git a/debian/patches/0499-90-relax-webrick.patch b/debian/patches/0499-90-relax-webrick.patch index debe30d0c3..38ebb45a66 100644 --- a/debian/patches/0499-90-relax-webrick.patch +++ b/debian/patches/0499-90-relax-webrick.patch @@ -1,6 +1,6 @@ --- a/Gemfile +++ b/Gemfile -@@ -315,7 +315,7 @@ +@@ -316,7 +316,7 @@ # Metrics group :metrics do gem 'method_source', '~> 1.0', require: false diff --git a/debian/patches/series b/debian/patches/series index d95465ad9e..d227d11a21 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,7 +16,6 @@ 0499-30-remove-guard-rspec.patch 0499-40-relax-rouge.patch 0499-70-relax-graphlient.patch -0499-80-relax-bcrypt.patch 0499-90-relax-webrick.patch 0500-set-webpack-root.patch 0510-remove-dev-dependencies.patch