Refresh patches
This commit is contained in:
Vinay Keshava
parent
33a6625bdf
commit
9697cdffc6
18 changed files with 131 additions and 138 deletions
142
debian/patches/Gemfile/0010-relax-stable-libs.patch
vendored
142
debian/patches/Gemfile/0010-relax-stable-libs.patch
vendored
|
|
@ -3,19 +3,19 @@ gitlab Gemfile
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -13,9 +13,9 @@
|
||||
@@ -13,9 +13,9 @@ gem 'bundler-checksum', '~> 0.1.0', path
|
||||
# NOTE: When incrementing the major or minor version here, also increment activerecord_version
|
||||
# in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve
|
||||
# https://gitlab.com/gitlab-org/gitlab/-/issues/375713
|
||||
-gem 'rails', '~> 6.1.6.1'
|
||||
+gem 'rails', '~> 6.1.6', '>= 6.1.6.1'
|
||||
-gem 'rails', '~> 6.1.7.2'
|
||||
+gem 'rails', '~> 6.1.7', '>= 6.1.7.2'
|
||||
|
||||
-gem 'bootsnap', '~> 1.15.0', require: false
|
||||
+gem 'bootsnap', '~> 1.15', require: false
|
||||
-gem 'bootsnap', '~> 1.16.0', require: false
|
||||
+gem 'bootsnap', '~> 1.16', require: false
|
||||
|
||||
# Pin openssl to match the version bundled with our supported Rubies.
|
||||
# See https://stdgems.org/openssl/#gem-version.
|
||||
@@ -29,55 +29,55 @@
|
||||
@@ -29,46 +29,46 @@ gem 'ipaddr', '1.2.2'
|
||||
# Responders respond_to and respond_with
|
||||
gem 'responders', '~> 3.0'
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ gitlab Gemfile
|
|||
+gem 'sprockets', '~> 3.7'
|
||||
|
||||
-gem 'view_component', '~> 2.74.1'
|
||||
+gem 'view_component', '~> 2.74','>= 2.74.1'
|
||||
+gem 'view_component', '~> 2.74', '>=2.74.1'
|
||||
|
||||
# Default values for AR models
|
||||
-gem 'default_value_for', '~> 3.4.0'
|
||||
|
|
@ -31,9 +31,9 @@ gitlab Gemfile
|
|||
|
||||
# Supported DBs
|
||||
-gem 'pg', '~> 1.4.5'
|
||||
+gem 'pg', '~> 1.4', '>= 1.4.5'
|
||||
+gem 'pg', '~> 1.4.5', '>= 1.4.5'
|
||||
|
||||
gem 'rugged', '~> 1.2'
|
||||
gem 'rugged', '~> 1.5'
|
||||
-gem 'grape-path-helpers', '~> 1.7.1'
|
||||
+gem 'grape-path-helpers', '~> 1.7', '>= 1.7.1'
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ gitlab Gemfile
|
|||
-gem 'ruby-saml', '~> 1.13.0'
|
||||
-gem 'omniauth', '~> 2.1.0'
|
||||
-gem 'omniauth-auth0', '~> 2.0.0'
|
||||
+gem 'rexml', '~> 3.2','>= 3.2.5'
|
||||
+gem 'rexml', '~> 3.2', '>= 3.2.5'
|
||||
+gem 'ruby-saml', '~> 1.13'
|
||||
+gem 'omniauth', '~> 2.1'
|
||||
+gem 'omniauth-auth0', '~> 2.0'
|
||||
|
|
@ -64,23 +64,22 @@ gitlab Gemfile
|
|||
gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md
|
||||
gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
|
||||
gem 'omniauth-dingtalk-oauth2', '~> 1.0'
|
||||
-gem 'omniauth-alicloud', '~> 2.0.0'
|
||||
-gem 'omniauth-alicloud', '~> 2.0.1'
|
||||
-gem 'omniauth-facebook', '~> 4.0.0'
|
||||
-gem 'omniauth-github', '2.0.1'
|
||||
+gem 'omniauth-alicloud', '~> 2.0'
|
||||
+gem 'omniauth-facebook', '~> 4.0'
|
||||
+gem 'omniauth-github', '~> 2.0', '>= 2.0.1'
|
||||
+gem 'omniauth-github', '2.0', '>= 2.0.1'
|
||||
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
|
||||
gem 'omniauth-google-oauth2', '~> 1.1'
|
||||
gem 'omniauth-oauth2-generic', '~> 0.2.2'
|
||||
-gem 'omniauth-saml', '~> 2.0.0'
|
||||
-gem 'omniauth-shibboleth', '~> 1.3.0'
|
||||
+gem 'omniauth-saml', '~> 2.0'
|
||||
+gem 'omniauth-shibboleth', '~> 1.3'
|
||||
gem 'omniauth-twitter', '~> 1.4'
|
||||
gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
|
||||
gem 'omniauth-authentiq', '~> 0.3.3'
|
||||
gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect'
|
||||
gem 'omniauth_openid_connect', '~> 0.6.1'
|
||||
@@ -77,8 +77,8 @@ gem 'omniauth_openid_connect', '~> 0.6.1
|
||||
gem 'openid_connect', '= 1.3.0'
|
||||
gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
|
||||
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
|
||||
-gem 'rack-oauth2', '~> 1.21.3'
|
||||
|
|
@ -89,8 +88,8 @@ gitlab Gemfile
|
|||
+gem 'jwt', '~> 2.1'
|
||||
|
||||
# Kerberos authentication. EE-only
|
||||
gem 'gssapi', group: :kerberos
|
||||
@@ -86,28 +86,28 @@
|
||||
gem 'gssapi', '~> 1.3.1', group: :kerberos
|
||||
@@ -87,28 +87,28 @@ gem 'timfel-krb5-auth', '~> 0.8', group:
|
||||
# Spam and anti-bot protection
|
||||
gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails'
|
||||
gem 'akismet', '~> 3.0'
|
||||
|
|
@ -125,7 +124,7 @@ gitlab Gemfile
|
|||
|
||||
# LDAP Auth
|
||||
# GitLab fork with several improvements to original library. For full list of changes
|
||||
@@ -116,30 +116,30 @@
|
||||
@@ -117,30 +117,30 @@ gem 'gitlab_omniauth-ldap', '~> 2.2.0',
|
||||
gem 'net-ldap', '~> 0.17.1'
|
||||
|
||||
# API
|
||||
|
|
@ -164,32 +163,32 @@ gitlab Gemfile
|
|||
|
||||
# for backups
|
||||
gem 'fog-aws', '~> 3.15'
|
||||
@@ -151,7 +151,7 @@
|
||||
gem 'fog-openstack', '~> 1.0'
|
||||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
gem 'fog-aliyun', '~> 0.3'
|
||||
@@ -158,7 +158,7 @@ gem 'fog-rackspace', '~> 0.1.1'
|
||||
# We may want to update this dependency if this is ever addressed upstream, e.g. via
|
||||
# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
|
||||
gem 'fog-aliyun', '~> 0.4'
|
||||
-gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm'
|
||||
+gem 'gitlab-fog-azure-rm', '~> 1.4', require: 'fog/azurerm'
|
||||
|
||||
# for Google storage
|
||||
gem 'google-api-client', '~> 0.33'
|
||||
@@ -160,37 +160,37 @@
|
||||
gem 'google-cloud-storage', '~> 1.44.0'
|
||||
@@ -176,36 +176,36 @@ gem 'google-apis-sqladmin_v1beta4', '~>
|
||||
gem 'unf', '~> 0.1.4'
|
||||
|
||||
# Seed data
|
||||
-gem 'seed-fu', '~> 2.3.7'
|
||||
+gem 'seed-fu', '~> 2.3','>= 2.3.7'
|
||||
+gem 'seed-fu', '~> 2.3', '>= 2.3.7'
|
||||
|
||||
# Search
|
||||
gem 'elasticsearch-model', '~> 7.2'
|
||||
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
|
||||
-gem 'elasticsearch-api', '7.13.3'
|
||||
-gem 'aws-sdk-core', '~> 3.168.4'
|
||||
+gem 'elasticsearch-api', '~> 7.13', '>= 7.13.3'
|
||||
+gem 'aws-sdk-core', '~> 3.168', '>= 3.168.4'
|
||||
-gem 'aws-sdk-core', '~> 3.170.0'
|
||||
+gem 'elasticsearch-api', '7.13', '>= 7.13.3'
|
||||
+gem 'aws-sdk-core', '~> 3.170', '>= 3.170.0'
|
||||
gem 'aws-sdk-cloudformation', '~> 1'
|
||||
-gem 'aws-sdk-s3', '~> 1.117.2'
|
||||
+gem 'aws-sdk-s3', '~> 1.117', '>= 1.117.2'
|
||||
-gem 'aws-sdk-s3', '~> 1.119.1'
|
||||
+gem 'aws-sdk-s3', '~> 1.119', '>= 1.119.1'
|
||||
gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
|
||||
-gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
|
||||
+gem 'typhoeus', '~> 1.4' # Used with Elasticsearch to support http keep-alive connections
|
||||
|
|
@ -197,22 +196,21 @@ gitlab Gemfile
|
|||
# Markdown and HTML processing
|
||||
-gem 'html-pipeline', '~> 2.14.3'
|
||||
-gem 'deckar01-task_list', '2.3.2'
|
||||
-gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup'
|
||||
+gem 'html-pipeline', '~> 2.14','>= 2.14.3'
|
||||
+gem 'deckar01-task_list', '~> 2.3','>= 2.3.2'
|
||||
+gem 'gitlab-markup', '~> 1.8', require: 'github/markup'
|
||||
-gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup'
|
||||
+gem 'html-pipeline', '~> 2.14', '>=2.14.3'
|
||||
+gem 'deckar01-task_list', '2.3', '>= 2.3.2'
|
||||
+gem 'gitlab-markup', '~> 1.9', require: 'github/markup'
|
||||
gem 'commonmarker', '~> 0.23.6'
|
||||
-gem 'kramdown', '~> 2.3.1'
|
||||
-gem 'RedCloth', '~> 4.3.2'
|
||||
-gem 'rdoc', '~> 6.3.2'
|
||||
+gem 'kramdown', '~> 2.3','>= 2.3.1'
|
||||
+gem 'RedCloth', '~> 4.3','>= 4.3.2'
|
||||
+gem 'rdoc', '~> 6.3','>= 6.3.2'
|
||||
+gem 'kramdown', '~> 2.3', '>=2.3.1'
|
||||
+gem 'RedCloth', '~> 4.3', '>= 4.3.2'
|
||||
+gem 'rdoc', '~> 6.3', '>= 6.3.2'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
-gem 'wikicloth', '0.8.1'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
-gem 'asciidoctor', '~> 2.0.17'
|
||||
+gem 'wikicloth', '~> 0.8.1'
|
||||
+gem 'asciidoctor', '~> 2.0', '>= 2.0.17'
|
||||
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
|
||||
gem 'asciidoctor-plantuml', '~> 0.0.16'
|
||||
|
|
@ -220,14 +218,12 @@ gitlab Gemfile
|
|||
-gem 'rouge', '~> 3.30.0'
|
||||
+gem 'rouge', '~> 3.30'
|
||||
gem 'truncato', '~> 0.7.12'
|
||||
-gem 'bootstrap_form', '~> 4.2.0'
|
||||
-gem 'nokogiri', '~> 1.13.10'
|
||||
+gem 'bootstrap_form', '~> 4.2'
|
||||
+gem 'nokogiri', '~> 1.13', '>= 1.13.10'
|
||||
-gem 'nokogiri', '~> 1.14.1'
|
||||
+gem 'nokogiri', '~> 1.14', '>= 1.14.1'
|
||||
|
||||
# Calendar rendering
|
||||
gem 'icalendar'
|
||||
@@ -200,12 +200,12 @@
|
||||
@@ -215,12 +215,12 @@ gem 'diffy', '~> 3.4'
|
||||
gem 'diff_match_patch', '~> 0.1.0'
|
||||
|
||||
# Application server
|
||||
|
|
@ -242,7 +238,7 @@ gitlab Gemfile
|
|||
gem 'puma_worker_killer', '~> 0.3.1', require: false
|
||||
gem 'sd_notify', '~> 0.1.0', require: false
|
||||
end
|
||||
@@ -217,13 +217,13 @@
|
||||
@@ -232,13 +232,13 @@ gem 'state_machines-activerecord', '~> 0
|
||||
gem 'acts-as-taggable-on', '~> 9.0'
|
||||
|
||||
# Background jobs
|
||||
|
|
@ -255,12 +251,12 @@ gitlab Gemfile
|
|||
gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch'
|
||||
|
||||
# Cron Parser
|
||||
-gem 'fugit', '~> 1.2.1'
|
||||
+gem 'fugit', '~> 1.2','>= 1.2.1'
|
||||
-gem 'fugit', '~> 1.8.1'
|
||||
+gem 'fugit', '~> 1.8', '>= 1.8.1'
|
||||
|
||||
# HTTP requests
|
||||
gem 'httparty', '~> 0.20.0'
|
||||
@@ -235,10 +235,10 @@
|
||||
@@ -250,10 +250,10 @@ gem 'rainbow', '~> 3.0'
|
||||
gem 'ruby-progressbar', '~> 1.10'
|
||||
|
||||
# GitLab settings
|
||||
|
|
@ -273,7 +269,7 @@ gitlab Gemfile
|
|||
|
||||
# Misc
|
||||
|
||||
@@ -251,21 +251,21 @@
|
||||
@@ -266,21 +266,21 @@ gem 'js_regex', '~> 3.8'
|
||||
gem 'device_detector'
|
||||
|
||||
# Redis
|
||||
|
|
@ -299,7 +295,7 @@ gitlab Gemfile
|
|||
|
||||
# Hangouts Chat integration
|
||||
gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
|
||||
@@ -281,10 +281,10 @@
|
||||
@@ -296,10 +296,10 @@ gem 'kubeclient', '~> 4.9.3', path: 'ven
|
||||
|
||||
# Sanitize user input
|
||||
gem 'sanitize', '~> 6.0'
|
||||
|
|
@ -312,7 +308,7 @@ gitlab Gemfile
|
|||
|
||||
# Working with license
|
||||
# Detects the open source license the repository includes
|
||||
@@ -306,32 +306,32 @@
|
||||
@@ -321,32 +321,32 @@ gem 'gitlab_chronic_duration', '~> 0.10.
|
||||
|
||||
gem 'rack-proxy', '~> 0.7.6'
|
||||
|
||||
|
|
@ -320,8 +316,8 @@ gitlab Gemfile
|
|||
-gem 'autoprefixer-rails', '10.2.5.1'
|
||||
-gem 'terser', '1.0.2'
|
||||
+gem 'sassc-rails', '~> 2.1'
|
||||
+gem 'autoprefixer-rails', '~> 10.2', '>= 10.2.5.1'
|
||||
+gem 'terser', '~> 1.0','>= 1.0.2'
|
||||
+gem 'autoprefixer-rails', '10.2', '>= 10.2.5.1'
|
||||
+gem 'terser', '1.0', '>= 1.0.2'
|
||||
|
||||
gem 'addressable', '~> 2.8'
|
||||
gem 'tanuki_emoji', '~> 0.6'
|
||||
|
|
@ -332,11 +328,11 @@ gitlab Gemfile
|
|||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
-gem 'gitlab-license', '~> 2.2.1'
|
||||
+gem 'gitlab-license', '~> 2.2','>= 2.2.1'
|
||||
+gem 'gitlab-license', '~> 2.2', '>= 2.2.1'
|
||||
|
||||
# Protect against bruteforcing
|
||||
-gem 'rack-attack', '~> 6.6.1'
|
||||
+gem 'rack-attack', '~> 6.6','>= 6.6.1'
|
||||
+gem 'rack-attack', '~> 6.6', '>= 6.6.1'
|
||||
|
||||
# Sentry integration
|
||||
gem 'sentry-raven', '~> 3.1'
|
||||
|
|
@ -349,16 +345,16 @@ gitlab Gemfile
|
|||
|
||||
# PostgreSQL query parsing
|
||||
#
|
||||
gem 'pg_query', '~> 2.2'
|
||||
gem 'pg_query', '~> 2.2', '>= 2.2.1'
|
||||
|
||||
-gem 'premailer-rails', '~> 1.10.3'
|
||||
+gem 'premailer-rails', '~> 1.10','>= 1.10.3'
|
||||
+gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
|
||||
|
||||
gem 'gitlab-labkit', '~> 0.29.0'
|
||||
gem 'gitlab-labkit', '~> 0.30.1'
|
||||
gem 'thrift', '>= 0.16.0'
|
||||
@@ -339,11 +339,11 @@
|
||||
@@ -354,11 +354,11 @@ gem 'thrift', '>= 0.16.0'
|
||||
# I18n
|
||||
gem 'ruby_parser', '~> 3.15', require: false
|
||||
gem 'ruby_parser', '~> 3.19', require: false
|
||||
gem 'rails-i18n', '~> 7.0'
|
||||
-gem 'gettext_i18n_rails', '~> 1.8.0'
|
||||
+gem 'gettext_i18n_rails', '~> 1.8'
|
||||
|
|
@ -370,7 +366,7 @@ gitlab Gemfile
|
|||
|
||||
# Perf bar
|
||||
gem 'peek', '~> 1.1'
|
||||
@@ -352,10 +352,10 @@
|
||||
@@ -367,10 +367,10 @@ gem 'peek', '~> 1.1'
|
||||
gem 'snowplow-tracker', '~> 0.8.0'
|
||||
|
||||
# Metrics
|
||||
|
|
@ -382,8 +378,8 @@ gitlab Gemfile
|
|||
+gem 'warning', '~> 1.3'
|
||||
|
||||
group :development do
|
||||
gem 'lefthook', '~> 1.2.7', require: false
|
||||
@@ -437,24 +437,24 @@
|
||||
gem 'lefthook', '~> 1.2.9', require: false
|
||||
@@ -452,24 +452,24 @@ group :development, :test, :omnibus do
|
||||
end
|
||||
|
||||
group :test do
|
||||
|
|
@ -419,7 +415,7 @@ gitlab Gemfile
|
|||
gem 'rspec_junit_formatter'
|
||||
gem 'guard-rspec'
|
||||
|
||||
@@ -483,8 +483,8 @@
|
||||
@@ -498,8 +498,8 @@ gem 'oauth2', '~> 2.0'
|
||||
gem 'health_check', '~> 3.0'
|
||||
|
||||
# System information
|
||||
|
|
@ -430,7 +426,7 @@ gitlab Gemfile
|
|||
|
||||
# NTP client
|
||||
gem 'net-ntp'
|
||||
@@ -493,25 +493,25 @@
|
||||
@@ -508,25 +508,25 @@ gem 'net-ntp'
|
||||
gem 'ssh_data', '~> 1.3'
|
||||
|
||||
# Spamcheck GRPC protocol definitions
|
||||
|
|
@ -438,8 +434,8 @@ gitlab Gemfile
|
|||
+gem 'spamcheck', '~> 1.0'
|
||||
|
||||
# Gitaly GRPC protocol definitions
|
||||
-gem 'gitaly', '~> 15.5.2'
|
||||
+gem 'gitaly', '~> 15.5'
|
||||
-gem 'gitaly', '~> 15.9.0-rc3'
|
||||
+gem 'gitaly', '~> 15.9'
|
||||
|
||||
# KAS GRPC protocol definitions
|
||||
gem 'kas-grpc', '~> 0.0.2'
|
||||
|
|
@ -461,7 +457,7 @@ gitlab Gemfile
|
|||
gem 'gitlab-experiment', '~> 0.7.1'
|
||||
|
||||
# Structured logging
|
||||
@@ -522,9 +522,9 @@
|
||||
@@ -537,9 +537,9 @@ gem 'grape_logging', '~> 1.8'
|
||||
gem 'gitlab-net-dns', '~> 0.9.1'
|
||||
|
||||
# Countries list
|
||||
|
|
@ -473,7 +469,7 @@ gitlab Gemfile
|
|||
|
||||
# LRU cache
|
||||
gem 'lru_redux'
|
||||
@@ -538,18 +538,18 @@
|
||||
@@ -553,18 +553,18 @@ gem 'mail-smtp_pool', '~> 0.1.0', path:
|
||||
gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer'
|
||||
|
||||
# File encryption
|
||||
|
|
@ -484,8 +480,8 @@ gitlab Gemfile
|
|||
gem 'valid_email', '~> 0.1'
|
||||
|
||||
# JSON
|
||||
-gem 'json', '~> 2.5.1'
|
||||
+gem 'json', '~> 2.5', '>= 2.5.1'
|
||||
-gem 'json', '~> 2.6.3'
|
||||
+gem 'json', '~> 2.6', '>= 2.6.3'
|
||||
gem 'json_schemer', '~> 0.2.18'
|
||||
-gem 'oj', '~> 3.13.21'
|
||||
+gem 'oj', '~> 3.13', '>= 3.13.21'
|
||||
|
|
@ -497,7 +493,7 @@ gitlab Gemfile
|
|||
|
||||
gem 'webauthn', '~> 2.3'
|
||||
|
||||
@@ -560,14 +560,14 @@
|
||||
@@ -575,14 +575,14 @@ gem 'parslet', '~> 1.8'
|
||||
|
||||
gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@ Bundler will fail when it can't find these locally
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -119,14 +119,11 @@
|
||||
@@ -120,14 +120,12 @@ gem 'net-ldap', '~> 0.17.1'
|
||||
gem 'grape', '~> 1.5','>= 1.5.2'
|
||||
gem 'grape-entity', '~> 0.10.0'
|
||||
gem 'rack-cors', '~> 1.1', '>= 1.1.1', require: 'rack/cors'
|
||||
-gem 'grape-swagger', '~>1.5.0', group: [:development, :test]
|
||||
-gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test]
|
||||
+
|
||||
|
||||
# GraphQL API
|
||||
gem 'graphql', '~> 1.13', '>= 1.13.12'
|
||||
|
|
@ -17,7 +18,7 @@ Bundler will fail when it can't find these locally
|
|||
gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
|
||||
|
||||
gem 'hashie', '~> 5.0'
|
||||
@@ -341,7 +338,6 @@
|
||||
@@ -356,7 +354,6 @@ gem 'ruby_parser', '~> 3.19', require: f
|
||||
gem 'rails-i18n', '~> 7.0'
|
||||
gem 'gettext_i18n_rails', '~> 1.8'
|
||||
gem 'gettext_i18n_rails_js', '~> 1.3'
|
||||
|
|
@ -25,17 +26,17 @@ Bundler will fail when it can't find these locally
|
|||
|
||||
gem 'batch-loader', '~> 2.0', '>= 2.0.1'
|
||||
|
||||
@@ -357,85 +353,6 @@
|
||||
@@ -372,84 +369,7 @@ gem 'prometheus-client-mmap', '~> 0.17',
|
||||
|
||||
gem 'warning', '~> 1.3'
|
||||
|
||||
-group :development do
|
||||
- gem 'lefthook', '~> 1.2.7', require: false
|
||||
- gem 'lefthook', '~> 1.2.9', require: false
|
||||
- gem 'rubocop'
|
||||
- gem 'solargraph', '~> 0.47.2', require: false
|
||||
-
|
||||
- gem 'letter_opener_web', '~> 2.0.0'
|
||||
- gem 'lookbook', '~> 1.4', '>= 1.4.5'
|
||||
- gem 'lookbook', '~> 1.5', '>= 1.5.3'
|
||||
-
|
||||
- # Better errors handler
|
||||
- gem 'better_errors', '~> 2.9.1'
|
||||
|
|
@ -50,13 +51,13 @@ Bundler will fail when it can't find these locally
|
|||
- gem 'bullet', '~> 7.0.2'
|
||||
- gem 'pry-byebug'
|
||||
- gem 'pry-rails', '~> 0.3.9'
|
||||
- gem 'pry-shell', '~> 0.5.1'
|
||||
- gem 'pry-shell', '~> 0.6.1'
|
||||
-
|
||||
- gem 'awesome_print', require: false
|
||||
-
|
||||
- gem 'database_cleaner', '~> 1.7.0'
|
||||
- gem 'factory_bot_rails', '~> 6.2.0'
|
||||
- gem 'rspec-rails', '~> 5.0.1'
|
||||
- gem 'rspec-rails', '~> 6.0.1'
|
||||
-
|
||||
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
||||
- gem 'minitest', '~> 5.11.0'
|
||||
|
|
@ -67,11 +68,11 @@ Bundler will fail when it can't find these locally
|
|||
- gem 'spring', '~> 4.1.0'
|
||||
- gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
-
|
||||
- gem 'gitlab-styles', '~> 9.2.0', require: false
|
||||
- gem 'gitlab-styles', '~> 10.0.0', require: false
|
||||
-
|
||||
- gem 'haml_lint', '~> 0.40.0', require: false
|
||||
- gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
-
|
||||
|
||||
- # Benchmarking & profiling
|
||||
- gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||
- gem 'benchmark-memory', '~> 0.1', require: false
|
||||
|
|
@ -93,7 +94,7 @@ Bundler will fail when it can't find these locally
|
|||
-end
|
||||
-
|
||||
-group :development, :test, :danger do
|
||||
- gem 'gitlab-dangerfiles', '~> 3.6.4', require: false
|
||||
- gem 'gitlab-dangerfiles', '~> 3.7.0', require: false
|
||||
-end
|
||||
-
|
||||
-group :development, :test, :coverage do
|
||||
|
|
@ -107,7 +108,6 @@ Bundler will fail when it can't find these locally
|
|||
-group :development, :test, :omnibus do
|
||||
- gem 'license_finder', '~> 7.0', require: false
|
||||
-end
|
||||
-
|
||||
|
||||
group :test do
|
||||
gem 'fuubar', '~> 2.2'
|
||||
gem 'rspec-retry', '~> 0.6.1'
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ Make test dependencies conditional so we can enable them when running autopkgtes
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -353,7 +353,7 @@
|
||||
@@ -371,7 +371,7 @@ gem 'warning', '~> 1.3'
|
||||
|
||||
|
||||
gem 'warning', '~> 1.3'
|
||||
|
||||
-group :test do
|
||||
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ Allow newer versions of httparty to satisfy dependency
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -223,7 +223,7 @@
|
||||
gem 'fugit', '~> 1.2','>= 1.2.1'
|
||||
@@ -239,7 +239,7 @@ gem 'gitlab-sidekiq-fetcher', '0.9.0', r
|
||||
gem 'fugit', '~> 1.8', '>= 1.8.1'
|
||||
|
||||
# HTTP requests
|
||||
-gem 'httparty', '~> 0.20.0'
|
||||
|
|
|
|||
10
debian/patches/Gemfile/0050-relax-rdoc.patch
vendored
10
debian/patches/Gemfile/0050-relax-rdoc.patch
vendored
|
|
@ -2,12 +2,12 @@ Allow rdoc from ruby 2.5 to match requirement
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -176,7 +176,7 @@
|
||||
@@ -193,7 +193,7 @@ gem 'gitlab-markup', '~> 1.9', require:
|
||||
gem 'commonmarker', '~> 0.23.6'
|
||||
gem 'kramdown', '~> 2.3','>= 2.3.1'
|
||||
gem 'RedCloth', '~> 4.3','>= 4.3.2'
|
||||
-gem 'rdoc', '~> 6.3','>= 6.3.2'
|
||||
gem 'kramdown', '~> 2.3', '>=2.3.1'
|
||||
gem 'RedCloth', '~> 4.3', '>= 4.3.2'
|
||||
-gem 'rdoc', '~> 6.3', '>= 6.3.2'
|
||||
+gem 'rdoc', '~> 6.0'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '~> 0.8.1'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
|
|
|
|||
|
|
@ -2,20 +2,21 @@ This gem is used only in gitlab Enterprise Edition
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -80,7 +80,6 @@
|
||||
@@ -81,7 +81,7 @@ gem 'rack-oauth2', '~> 1.21', '>= 1.21.3
|
||||
gem 'jwt', '~> 2.1'
|
||||
|
||||
# Kerberos authentication. EE-only
|
||||
-gem 'gssapi', group: :kerberos
|
||||
-gem 'gssapi', '~> 1.3.1', group: :kerberos
|
||||
+
|
||||
gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
|
||||
|
||||
# Spam and anti-bot protection
|
||||
@@ -313,8 +312,6 @@
|
||||
@@ -329,7 +329,7 @@ gem 'gon', '~> 6.4'
|
||||
gem 'request_store', '~> 1.5', '>= 1.5.1'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
-gem 'gitlab-license', '~> 2.2','>= 2.2.1'
|
||||
-
|
||||
# Protect against bruteforcing
|
||||
gem 'rack-attack', '~> 6.6','>= 6.6.1'
|
||||
-gem 'gitlab-license', '~> 2.2', '>= 2.2.1'
|
||||
+
|
||||
|
||||
# Protect against bruteforcing
|
||||
gem 'rack-attack', '~> 6.6', '>= 6.6.1'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -357,7 +357,7 @@
|
||||
@@ -378,7 +378,7 @@ if ENV["INCLUDE_TEST_DEPENDS"] == "true"
|
||||
gem 'rspec-benchmark', '~> 0.6.0'
|
||||
gem 'rspec-parameterized', require: false
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -358,7 +358,6 @@
|
||||
@@ -379,7 +379,6 @@ if ENV["INCLUDE_TEST_DEPENDS"] == "true"
|
||||
gem 'rspec-parameterized', require: false
|
||||
|
||||
gem 'capybara', '~> 3.12'
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@ libruby2.7 has rexml 3.2.3.1 which has latest security fixes
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -54,7 +54,7 @@
|
||||
@@ -54,7 +54,7 @@ gem 'devise-pbkdf2-encryptable', '~> 0.0
|
||||
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
|
||||
gem 'doorkeeper', '~> 5.5'
|
||||
gem 'doorkeeper-openid_connect', '~> 1.8'
|
||||
-gem 'rexml', '~> 3.2','>= 3.2.5'
|
||||
+gem 'rexml', '~> 3.2','>= 3.2.3.1'
|
||||
-gem 'rexml', '~> 3.2', '>= 3.2.5'
|
||||
+gem 'rexml', '~> 3.2', '>= 3.2.3.1'
|
||||
gem 'ruby-saml', '~> 1.13'
|
||||
gem 'omniauth', '~> 2.1'
|
||||
gem 'omniauth-auth0', '~> 2.0'
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@ Forwarded: https://gitlab.com/gitlab-org/gitlab/-/issues/354323
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -39,6 +39,9 @@
|
||||
@@ -39,6 +39,9 @@ gem 'default_value_for', '~> 3.4'
|
||||
# Supported DBs
|
||||
gem 'pg', '~> 1.4', '>= 1.4.5'
|
||||
gem 'pg', '~> 1.4.5', '>= 1.4.5'
|
||||
|
||||
+# Background migrations/fix vulnerabilities
|
||||
+gem 'parser', '~> 3.0'
|
||||
+
|
||||
gem 'rugged', '~> 1.2'
|
||||
gem 'rugged', '~> 1.5'
|
||||
gem 'grape-path-helpers', '~> 1.7', '>= 1.7.1'
|
||||
|
||||
|
|
|
|||
8
debian/patches/Gemfile/0190-relax-rdoc.patch
vendored
8
debian/patches/Gemfile/0190-relax-rdoc.patch
vendored
|
|
@ -1,11 +1,11 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -178,7 +178,7 @@
|
||||
@@ -196,7 +196,7 @@ gem 'gitlab-markup', '~> 1.9', require:
|
||||
gem 'commonmarker', '~> 0.23.6'
|
||||
gem 'kramdown', '~> 2.3','>= 2.3.1'
|
||||
gem 'RedCloth', '~> 4.3','>= 4.3.2'
|
||||
gem 'kramdown', '~> 2.3', '>=2.3.1'
|
||||
gem 'RedCloth', '~> 4.3', '>= 4.3.2'
|
||||
-gem 'rdoc', '~> 6.0'
|
||||
+gem 'rdoc'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '~> 0.8.1'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ Subject: [PATCH] Update omniauth-auth0 rubygem to 3.1
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -60,7 +60,7 @@
|
||||
gem 'rexml', '~> 3.2','>= 3.2.3.1'
|
||||
@@ -60,7 +60,7 @@ gem 'doorkeeper-openid_connect', '~> 1.8
|
||||
gem 'rexml', '~> 3.2', '>= 3.2.3.1'
|
||||
gem 'ruby-saml', '~> 1.13'
|
||||
gem 'omniauth', '~> 2.1'
|
||||
-gem 'omniauth-auth0', '~> 2.0'
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ These are not required in production
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -211,60 +211,7 @@
|
||||
@@ -210,58 +210,6 @@
|
||||
"yaml": "^2.0.0-10"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
@ -21,10 +21,10 @@ These are not required in production
|
|||
- "cheerio": "^1.0.0-rc.9",
|
||||
- "commander": "^2.20.3",
|
||||
- "custom-jquery-matchers": "^2.1.0",
|
||||
- "eslint": "8.28.0",
|
||||
- "eslint": "8.32.0",
|
||||
- "eslint-import-resolver-jest": "3.0.2",
|
||||
- "eslint-import-resolver-webpack": "0.13.2",
|
||||
- "eslint-plugin-import": "^2.26.0",
|
||||
- "eslint-plugin-import": "^2.27.5",
|
||||
- "eslint-plugin-no-jquery": "2.7.0",
|
||||
- "eslint-plugin-no-unsanitized": "^4.0.2",
|
||||
- "gettext-extractor": "^3.5.3",
|
||||
|
|
@ -40,7 +40,6 @@ These are not required in production
|
|||
- "jest-jasmine2": "^28.1.3",
|
||||
- "jest-junit": "^12.3.0",
|
||||
- "jest-util": "^28.1.3",
|
||||
- "jsonlint": "^1.6.3",
|
||||
- "markdownlint-cli": "0.32.2",
|
||||
- "miragejs": "^0.1.40",
|
||||
- "mock-apollo-client": "1.2.0",
|
||||
|
|
@ -59,8 +58,6 @@ These are not required in production
|
|||
- "xhr-mock": "^2.5.1",
|
||||
- "yarn-check-webpack-plugin": "^1.2.0",
|
||||
- "yarn-deduplicate": "^6.0.0"
|
||||
- },
|
||||
+ },
|
||||
},
|
||||
"blockedDependencies": {
|
||||
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ Use debian packaged node modules when available
|
|||
|
||||
--- a/config/webpack.config.js
|
||||
+++ b/config/webpack.config.js
|
||||
@@ -19,7 +19,6 @@
|
||||
@@ -19,7 +19,6 @@ const VUE_VERSION = require('vue/package
|
||||
const { ESBuildMinifyPlugin } = require('esbuild-loader');
|
||||
|
||||
const webpack = require('webpack');
|
||||
|
|
@ -27,7 +27,7 @@ Use debian packaged node modules when available
|
|||
const { StatsWriterPlugin } = require('webpack-stats-plugin');
|
||||
const WEBPACK_VERSION = require('webpack/package.json').version;
|
||||
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
|
||||
@@ -289,6 +288,8 @@
|
||||
@@ -289,6 +288,8 @@ module.exports = {
|
||||
|
||||
entry: generateEntries,
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ Use debian packaged node modules when available
|
|||
output: {
|
||||
path: WEBPACK_OUTPUT_PATH,
|
||||
publicPath: WEBPACK_PUBLIC_PATH,
|
||||
@@ -300,10 +301,15 @@
|
||||
@@ -300,10 +301,15 @@ module.exports = {
|
||||
},
|
||||
|
||||
resolve: {
|
||||
|
|
@ -53,7 +53,7 @@ Use debian packaged node modules when available
|
|||
module: {
|
||||
strictExportPresence: true,
|
||||
rules: [
|
||||
@@ -424,7 +430,7 @@
|
||||
@@ -436,7 +442,7 @@ module.exports = {
|
||||
},
|
||||
{
|
||||
test: /\.(eot|ttf|woff|woff2)$/,
|
||||
|
|
@ -62,7 +62,7 @@ Use debian packaged node modules when available
|
|||
loader: 'file-loader',
|
||||
options: {
|
||||
name: '[name].[contenthash:8].[ext]',
|
||||
@@ -845,6 +851,7 @@
|
||||
@@ -857,6 +863,7 @@ module.exports = {
|
||||
|
||||
node: {
|
||||
fs: 'empty', // editorconfig requires 'fs'
|
||||
|
|
@ -72,7 +72,7 @@ Use debian packaged node modules when available
|
|||
};
|
||||
--- a/app/assets/javascripts/pdf/index.vue
|
||||
+++ b/app/assets/javascripts/pdf/index.vue
|
||||
@@ -3,7 +3,7 @@
|
||||
@@ -3,7 +3,7 @@ import { getDocument, GlobalWorkerOption
|
||||
|
||||
import Page from './page/index.vue';
|
||||
|
||||
|
|
@ -91,6 +91,6 @@ Use debian packaged node modules when available
|
|||
- "@babel/preset-env": "^7.18.2",
|
||||
+ "@babel/core": "link:/usr/share/nodejs/@babel/core",
|
||||
+ "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
|
||||
"@codesandbox/sandpack-client": "^1.2.2",
|
||||
"@cubejs-client/core": "^0.31.15",
|
||||
"@cubejs-client/vue": "^0.31.19",
|
||||
"@gitlab/at.js": "1.5.7",
|
||||
|
|
|
|||
|
|
@ -9,5 +9,5 @@
|
|||
+ "@babel/plugin-proposal-private-methods": "link:/usr/share/nodejs/@babel/plugin-proposal-private-methods",
|
||||
+ "@babel/plugin-syntax-import-meta": "link:/usr/share/nodejs/@babel/plugin-syntax-import-meta",
|
||||
"@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
|
||||
"@codesandbox/sandpack-client": "^1.2.2",
|
||||
"@cubejs-client/core": "^0.31.15",
|
||||
"@cubejs-client/vue": "^0.31.19",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ yaml from npm registry needs a newer nodejs than what is in bullseye
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -212,7 +212,7 @@
|
||||
@@ -211,7 +211,7 @@
|
||||
"webpack-stats-plugin": "^0.3.1",
|
||||
"worker-loader": "^2.0.0",
|
||||
"xterm": "3.14.5",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ This fixes webpack error when newer versions are pulled by yarn
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -68,39 +68,39 @@
|
||||
@@ -67,39 +67,39 @@
|
||||
"@rails/actioncable": "6.1.4-7",
|
||||
"@rails/ujs": "6.1.4-7",
|
||||
"@sourcegraph/code-host-integration": "0.0.84",
|
||||
|
|
@ -72,8 +72,8 @@ This fixes webpack error when newer versions are pulled by yarn
|
|||
+ "@tiptap/suggestion": "2.0.0-beta.202",
|
||||
"@tiptap/vue-2": "2.0.0-beta.200",
|
||||
"apollo-upload-client": "15.0.0",
|
||||
"autosize": "^5.0.1",
|
||||
@@ -221,7 +221,9 @@
|
||||
"apollo3-cache-persist": "^0.14.1",
|
||||
@@ -220,7 +220,9 @@
|
||||
},
|
||||
"resolutions": {
|
||||
"chokidar": "^3.5.3",
|
||||
|
|
|
|||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
|
@ -14,7 +14,6 @@ Gemfile/0200-add-gitlab-dangerfiles.patch
|
|||
Gemfile/0210-comment-out-openssl.patch
|
||||
Gemfile/0220-relax-oj-in-ipynbdiff.patch
|
||||
Gemfile/0230-relax-omniauth-auth0.patch
|
||||
Gemfile/0240-remove-omniauth-shibboleth.patch
|
||||
nodejs/0010-set-webpack-root.patch
|
||||
nodejs/0020-remove-dev-dependencies.patch
|
||||
nodejs/0030-use-yarnpkg.patch
|
||||
|
|
|
|||
Loading…
Reference in a new issue