Relax dependency on bcrypt and webrick in Gemfile

This commit is contained in:
Pirate Praveen 2021-03-08 23:36:37 +05:30
parent e353b2665a
commit be7e61c63e
3 changed files with 25 additions and 0 deletions

View file

@ -0,0 +1,12 @@
--- 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'

View file

@ -0,0 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -315,7 +315,7 @@
# Metrics
group :metrics do
gem 'method_source', '~> 1.0', require: false
- gem 'webrick', '~> 1.6.1', require: false
+ gem 'webrick', '~> 1.6', require: false
# Prometheus
gem 'prometheus-client-mmap', '~> 0.12.0'

View file

@ -16,6 +16,8 @@
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
0520-add-system-lib-path-for-webpack.patch