realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refresh patches

Browse source
This commit is contained in:
Pirate Praveen 2022-08-27 14:03:50 +05:30
parent f080289c95
commit 9a6364fe81
No known key found for this signature in database
GPG key ID: 8F53E0193B294B75
11 changed files with 107 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
debian/patches/Gemfile/0010-relax-stable-libs.patch vendored
View file

@ -7,11 +7,11 @@ gitlab Gemfile
source 'https://rubygems.org' source 'https://rubygems.org'
-gem 'rails', '~> 6.1.4.7' -gem 'rails', '~> 6.1.6.1'
+gem 'rails', '~> 6.1.4', '>= 6.1.4.7' +gem 'rails', '~> 6.1.6', '>= 6.1.6.1'
-gem 'bootsnap', '~> 1.12.0', require: false -gem 'bootsnap', '~> 1.13.0', require: false
+gem 'bootsnap', '~> 1.12', require: false +gem 'bootsnap', '~> 1.13', require: false
# Responders respond_to and respond_with # Responders respond_to and respond_with
gem 'responders', '~> 3.0' gem 'responders', '~> 3.0'
@ -19,20 +19,19 @@ gitlab Gemfile
-gem 'sprockets', '~> 3.7.0' -gem 'sprockets', '~> 3.7.0'
+gem 'sprockets', '~> 3.7' +gem 'sprockets', '~> 3.7'
-gem 'view_component', '~> 2.50.0' gem 'view_component', '~> 2.61'
+gem 'view_component', '~> 2.50'
# Default values for AR models # Default values for AR models
-gem 'default_value_for', '~> 3.4.0' -gem 'default_value_for', '~> 3.4.0'
+gem 'default_value_for', '~> 3.4' +gem 'default_value_for', '~> 3.4'
# Supported DBs # Supported DBs
-gem 'pg', '~> 1.3.0' -gem 'pg', '~> 1.4.0'
+gem 'pg', '~> 1.3' +gem 'pg', '~> 1.4'
gem 'rugged', '~> 1.2' gem 'rugged', '~> 1.2'
-gem 'grape-path-helpers', '~> 1.7.0' -gem 'grape-path-helpers', '~> 1.7.1'
+gem 'grape-path-helpers', '~> 1.7' +gem 'grape-path-helpers', '~> 1.7', '>= 1.7.1'
gem 'faraday', '~> 1.0' gem 'faraday', '~> 1.0'
-gem 'marginalia', '~> 1.10.0' -gem 'marginalia', '~> 1.10.0'
@ -59,9 +58,8 @@ gitlab Gemfile
-gem 'omniauth-auth0', '~> 2.0.0' -gem 'omniauth-auth0', '~> 2.0.0'
+gem 'omniauth-auth0', '~> 2.0' +gem 'omniauth-auth0', '~> 2.0'
gem 'omniauth-azure-activedirectory-v2', '~> 1.0' gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version gem 'omniauth-azure-oauth2', '~> 0.0.9' # See vendor/gems/omniauth-azure-oauth2/README.md
-gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
+gem 'omniauth-cas3', '~> 1.1','>= 1.1.4'
gem 'omniauth-dingtalk-oauth2', '~> 1.0' gem 'omniauth-dingtalk-oauth2', '~> 1.0'
-gem 'omniauth-alicloud', '~> 1.0.1' -gem 'omniauth-alicloud', '~> 1.0.1'
-gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-facebook', '~> 4.0.0'
@ -83,9 +81,9 @@ gitlab Gemfile
-gem 'omniauth-salesforce', '~> 1.0.5' -gem 'omniauth-salesforce', '~> 1.0.5'
+gem 'omniauth-salesforce', '~> 1.0','>= 1.0.5' +gem 'omniauth-salesforce', '~> 1.0','>= 1.0.5'
gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
-gem 'rack-oauth2', '~> 1.19.0' -gem 'rack-oauth2', '~> 1.21.2'
-gem 'jwt', '~> 2.1.0' -gem 'jwt', '~> 2.1.0'
+gem 'rack-oauth2', '~> 1.19' +gem 'rack-oauth2', '~> 1.21', '>= 1.21.2'
+gem 'jwt', '~> 2.1' +gem 'jwt', '~> 2.1'
# Kerberos authentication. EE-only # Kerberos authentication. EE-only
@ -111,9 +109,9 @@ gitlab Gemfile
+gem 'validates_hostname', '~> 1.0', '>= 1.0.11' +gem 'validates_hostname', '~> 1.0', '>= 1.0.11'
+gem 'rubyzip', '~> 2.0', '>= 2.3.2', require: 'zip' +gem 'rubyzip', '~> 2.0', '>= 2.3.2', require: 'zip'
# GitLab Pages letsencrypt support # GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.9' gem 'acme-client', '~> 2.0'
@@ -87,7 +87,7 @@ @@ -87,24 +87,24 @@
gem 'ohai', '~> 16.10' gem 'ohai', '~> 16.10'
# GPG # GPG
@ -122,7 +120,9 @@ gitlab Gemfile
# LDAP Auth # LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes # GitLab fork with several improvements to original library. For full list of changes
@@ -96,15 +96,15 @@ # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.2', require: 'omniauth-ldap'
gem 'net-ldap', '~> 0.16.3' gem 'net-ldap', '~> 0.16.3'
# API # API
@ -217,13 +217,13 @@ gitlab Gemfile
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-plantuml', '~> 0.0.12'
gem 'asciidoctor-kroki', '~> 0.5.0', require: false gem 'asciidoctor-kroki', '~> 0.5.0', require: false
-gem 'rouge', '~> 3.29.0' -gem 'rouge', '~> 3.30.0'
+gem 'rouge', '~> 3.29' +gem 'rouge', '~> 3.30'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.12'
-gem 'bootstrap_form', '~> 4.2.0' -gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.13.6' -gem 'nokogiri', '~> 1.13.0'
+gem 'bootstrap_form', '~> 4.2' +gem 'bootstrap_form', '~> 4.2'
+gem 'nokogiri', '~> 1.13', '>= 1.13.6' +gem 'nokogiri', '~> 1.13'
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
# Calendar rendering # Calendar rendering
@ -237,8 +237,8 @@ gitlab Gemfile
gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base' gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base'
group :puma do group :puma do
- gem 'puma', '~> 5.6.2', require: false - gem 'puma', '~> 5.6.4', require: false
+ gem 'puma', '~> 5.6', '>= 5.6.2', require: false + gem 'puma', '~> 5.6', '>= 5.6.4', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false
gem 'sd_notify', '~> 0.1.0', require: false gem 'sd_notify', '~> 0.1.0', require: false
end end
@ -283,8 +283,8 @@ gitlab Gemfile
gem 'connection_pool', '~> 2.0' gem 'connection_pool', '~> 2.0'
# Redis session store # Redis session store
-gem 'redis-actionpack', '~> 5.2.0' -gem 'redis-actionpack', '~> 5.3.0'
+gem 'redis-actionpack', '~> 5.2' +gem 'redis-actionpack', '~> 5.3'
# Discord integration # Discord integration
gem 'discordrb-webhooks', '~> 3.4', require: false gem 'discordrb-webhooks', '~> 3.4', require: false
@ -307,8 +307,8 @@ gitlab Gemfile
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration # Kubernetes integration
-gem 'kubeclient', '~> 4.9.2' -gem 'kubeclient', '~> 4.9.3'
+gem 'kubeclient', '~> 4.9','>= 4.9.2' +gem 'kubeclient', '~> 4.9','>= 4.9.3'
# Sanitize user input # Sanitize user input
gem 'sanitize', '~> 6.0' gem 'sanitize', '~> 6.0'
@ -343,8 +343,8 @@ gitlab Gemfile
gem 'request_store', '~> 1.5' gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'
-gem 'gitlab-license', '~> 2.1.0' -gem 'gitlab-license', '~> 2.2.1'
+gem 'gitlab-license', '~> 2.1' +gem 'gitlab-license', '~> 2.2','>= 2.2.1'
# Protect against bruteforcing # Protect against bruteforcing
-gem 'rack-attack', '~> 6.6.0' -gem 'rack-attack', '~> 6.6.0'
@ -368,7 +368,7 @@ gitlab Gemfile
+gem 'premailer-rails', '~> 1.10','>= 1.10.3' +gem 'premailer-rails', '~> 1.10','>= 1.10.3'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.23.0' gem 'gitlab-labkit', '~> 0.24.0'
@@ -325,11 +325,11 @@ @@ -325,11 +325,11 @@
# I18n # I18n
gem 'ruby_parser', '~> 3.15', require: false gem 'ruby_parser', '~> 3.15', require: false
@ -395,8 +395,8 @@ gitlab Gemfile
+gem 'warning', '~> 1.3' +gem 'warning', '~> 1.3'
group :development do group :development do
gem 'lefthook', '~> 1.0.0', require: false gem 'lefthook', '~> 1.1.0', require: false
@@ -427,22 +427,22 @@ @@ -422,24 +422,24 @@
end end
group :test do group :test do
@ -411,6 +411,8 @@ gitlab Gemfile
- gem 'capybara-screenshot', '~> 1.0.22' - gem 'capybara-screenshot', '~> 1.0.22'
- gem 'selenium-webdriver', '~> 3.142' - gem 'selenium-webdriver', '~> 3.142'
- -
- gem 'graphlyte', '~> 1.0.0'
-
- gem 'shoulda-matchers', '~> 5.1.0', require: false - gem 'shoulda-matchers', '~> 5.1.0', require: false
- gem 'email_spec', '~> 2.2.0' - gem 'email_spec', '~> 2.2.0'
- gem 'webmock', '~> 3.9.1' - gem 'webmock', '~> 3.9.1'
@ -418,6 +420,8 @@ gitlab Gemfile
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22' + gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
+ gem 'selenium-webdriver', '~> 3.1','>= 3.142' + gem 'selenium-webdriver', '~> 3.1','>= 3.142'
+ +
+ gem 'graphlyte', '~> 1.0'
+
+ gem 'shoulda-matchers', '~> 5.1', require: false + gem 'shoulda-matchers', '~> 5.1', require: false
+ gem 'email_spec', '~> 2.2' + gem 'email_spec', '~> 2.2'
+ gem 'webmock', '~> 3.9', '>= 3.9.1' + gem 'webmock', '~> 3.9', '>= 3.9.1'
@ -428,7 +432,7 @@ gitlab Gemfile
gem 'rspec_junit_formatter' gem 'rspec_junit_formatter'
gem 'guard-rspec' gem 'guard-rspec'
@@ -459,7 +459,7 @@ @@ -456,7 +456,7 @@
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
@ -437,7 +441,7 @@ gitlab Gemfile
gem 'stackprof', '~> 0.2.15', require: false gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false gem 'memory_profiler', '~> 0.9', require: false
@@ -473,8 +473,8 @@ @@ -470,8 +470,8 @@
gem 'health_check', '~> 3.0' gem 'health_check', '~> 3.0'
# System information # System information
@ -448,12 +452,12 @@ gitlab Gemfile
# NTP client # NTP client
gem 'net-ntp' gem 'net-ntp'
@@ -486,14 +486,14 @@ @@ -483,12 +483,12 @@
gem 'spamcheck', '~> 0.1.0' gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 15.1.0-rc1' -gem 'gitaly', '~> 15.3.0-rc3'
+gem 'gitaly', '~> 15.1' +gem 'gitaly', '~> 15.3'
# KAS GRPC protocol definitions # KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2' gem 'kas-grpc', '~> 0.0.2'
@ -461,21 +465,18 @@ gitlab Gemfile
-gem 'grpc', '~> 1.42.0' -gem 'grpc', '~> 1.42.0'
+gem 'grpc', '~> 1.42' +gem 'grpc', '~> 1.42'
-gem 'google-protobuf', '~> 3.19.0' gem 'google-protobuf', '~> 3.21'
+gem 'google-protobuf', '~> 3.19'
gem 'toml-rb', '~> 2.0' @@ -498,7 +498,7 @@
gem 'flipper', '~> 0.25.0'
@@ -501,7 +501,7 @@ gem 'flipper-active_record', '~> 0.25.0'
gem 'flipper', '~> 0.21.0' gem 'flipper-active_support_cache_store', '~> 0.25.0'
gem 'flipper-active_record', '~> 0.21.0'
gem 'flipper-active_support_cache_store', '~> 0.21.0'
-gem 'unleash', '~> 3.2.2' -gem 'unleash', '~> 3.2.2'
+gem 'unleash', '~> 3.2', '>= 3.2.2' +gem 'unleash', '~> 3.2', '>= 3.2.2'
gem 'gitlab-experiment', '~> 0.7.1' gem 'gitlab-experiment', '~> 0.7.1'
# Structured logging # Structured logging
@@ -514,12 +514,12 @@ @@ -511,12 +511,12 @@
# Countries list # Countries list
gem 'countries', '~> 3.0' gem 'countries', '~> 3.0'
@ -490,23 +491,23 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved # Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb` # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -534,11 +534,11 @@ @@ -531,11 +531,11 @@
gem 'valid_email', '~> 0.1' gem 'valid_email', '~> 0.1'
# JSON # JSON
-gem 'json', '~> 2.5.1' -gem 'json', '~> 2.5.1'
+gem 'json', '~> 2.5', '>= 2.5.1' +gem 'json', '~> 2.5', '>= 2.5.1'
gem 'json_schemer', '~> 0.2.18' gem 'json_schemer', '~> 0.2.18'
-gem 'oj', '~> 3.13.19' -gem 'oj', '~> 3.13.20'
-gem 'multi_json', '~> 1.14.1' -gem 'multi_json', '~> 1.14.1'
-gem 'yajl-ruby', '~> 1.4.1', require: 'yajl' -gem 'yajl-ruby', '~> 1.4.3', require: 'yajl'
+gem 'oj', '~> 3.13', '>= 3.13.19' +gem 'oj', '~> 3.13', '>= 3.13.20'
+gem 'multi_json', '~> 1.14', '>= 1.14.1' +gem 'multi_json', '~> 1.14', '>= 1.14.1'
+gem 'yajl-ruby', '~> 1.4', '>= 1.4.1', require: 'yajl' +gem 'yajl-ruby', '~> 1.4','>= 1.4.3', require: 'yajl'
gem 'webauthn', '~> 2.3' gem 'webauthn', '~> 2.3'
@@ -549,7 +549,7 @@ @@ -546,7 +546,7 @@
gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff' gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'

21
debian/patches/Gemfile/0020-remove-development-test.patch vendored
View file

@ -18,32 +18,30 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 2.0', '>= 2.0.1' gem 'batch-loader', '~> 2.0', '>= 2.0.1'
@@ -344,88 +342,6 @@ @@ -344,83 +342,6 @@
gem 'warning', '~> 1.3' gem 'warning', '~> 1.3'
-group :development do -group :development do
- gem 'lefthook', '~> 1.0.0', require: false - gem 'lefthook', '~> 1.1.0', require: false
- gem 'rubocop' - gem 'rubocop'
- gem 'solargraph', '~> 0.44.3', require: false - gem 'solargraph', '~> 0.45.0', require: false
- -
- gem 'letter_opener_web', '~> 2.0.0' - gem 'letter_opener_web', '~> 2.0.0'
- gem 'lookbook'
- -
- # Better errors handler - # Better errors handler
- gem 'better_errors', '~> 2.9.0' - gem 'better_errors', '~> 2.9.0'
- -
- # thin instead webrick
- gem 'thin', '~> 1.8.0'
-
- gem 'sprite-factory', '~> 1.7' - gem 'sprite-factory', '~> 1.7'
-end -end
- -
-group :development, :test do -group :development, :test do
- gem 'deprecation_toolkit', '~> 1.5.1', require: false - gem 'deprecation_toolkit', '~> 1.5.1', require: false
- gem 'bullet', '~> 6.1.3' - gem 'bullet', '~> 7.0.2'
- gem 'pry-byebug' - gem 'pry-byebug'
- gem 'pry-rails', '~> 0.3.9' - gem 'pry-rails', '~> 0.3.9'
- gem 'pry-shell', '~> 0.5.0' - gem 'pry-shell', '~> 0.5.1'
- -
- gem 'awesome_print', require: false - gem 'awesome_print', require: false
- -
@ -86,7 +84,7 @@ Bundler will fail when it can't find these locally
-end -end
- -
-group :development, :test, :danger do -group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 3.4.3', require: false - gem 'gitlab-dangerfiles', '~> 3.5.0', require: false
-end -end
- -
-group :development, :test, :coverage do -group :development, :test, :coverage do
@ -98,10 +96,7 @@ Bundler will fail when it can't find these locally
- -
-# Gems required in omnibus-gitlab pipeline -# Gems required in omnibus-gitlab pipeline
-group :development, :test, :omnibus do -group :development, :test, :omnibus do
- # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is - gem 'license_finder', '~> 7.0', require: false
- # resolved. For details, check discussion in
- # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881
- gem 'gitlab-license_finder', '~> 6.0', require: false
-end -end
- -
group :test do group :test do

2
debian/patches/Gemfile/0090-remove-ee-only-gems.patch vendored
View file

@ -14,7 +14,7 @@ This gem is used only in gitlab Enterprise Edition
gem 'request_store', '~> 1.5' gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'
-gem 'gitlab-license', '~> 2.1' -gem 'gitlab-license', '~> 2.2','>= 2.2.1'
- -
# Protect against bruteforcing # Protect against bruteforcing
gem 'rack-attack', '~> 6.6' gem 'rack-attack', '~> 6.6'

2
debian/patches/Gemfile/0130-remove-capybara-screenshot.patch vendored
View file

@ -7,4 +7,4 @@
- gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22' - gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
gem 'selenium-webdriver', '~> 3.1','>= 3.142' gem 'selenium-webdriver', '~> 3.1','>= 3.142'
gem 'shoulda-matchers', '~> 5.1', require: false gem 'graphlyte', '~> 1.0'

2
debian/patches/Gemfile/0140-remove-guard-rspec.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -356,7 +356,6 @@ @@ -358,7 +358,6 @@
gem 'concurrent-ruby', '~> 1.1' gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 1.0', '>= 1.0.7' gem 'test-prof', '~> 1.0', '>= 1.0.7'
gem 'rspec_junit_formatter' gem 'rspec_junit_formatter'

4
debian/patches/Gemfile/0180-add-parser-gem.patch vendored
View file

@ -4,11 +4,11 @@ Forwarded: https://gitlab.com/gitlab-org/gitlab/-/issues/354323
+++ b/Gemfile +++ b/Gemfile
@@ -19,6 +19,9 @@ @@ -19,6 +19,9 @@
# Supported DBs # Supported DBs
gem 'pg', '~> 1.3' gem 'pg', '~> 1.4'
+# Background migrations/fix vulnerabilities +# Background migrations/fix vulnerabilities
+gem 'parser', '~> 3.0' +gem 'parser', '~> 3.0'
+ +
gem 'rugged', '~> 1.2' gem 'rugged', '~> 1.2'
gem 'grape-path-helpers', '~> 1.7' gem 'grape-path-helpers', '~> 1.7', '>= 1.7.1'

2
debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch vendored
View file

@ -2,7 +2,7 @@ Rakefile need this gem
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -468,3 +468,6 @@ @@ -470,3 +470,6 @@
# Error Tracking OpenAPI client # Error Tracking OpenAPI client
# See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api'

40
debian/patches/nodejs/0020-remove-dev-dependencies.patch vendored
View file

@ -2,27 +2,26 @@ These are not required in production
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -199,62 +199,7 @@ @@ -198,58 +198,7 @@
"yaml": "^2.0.0-10" "yaml": "^2.0.0-10"
}, },
"devDependencies": { "devDependencies": {
- "@gitlab/eslint-plugin": "13.1.0", - "@gitlab/eslint-plugin": "16.0.0",
- "@gitlab/stylelint-config": "4.1.0", - "@gitlab/stylelint-config": "4.1.0",
- "@graphql-eslint/eslint-plugin": "3.10.6", - "@graphql-eslint/eslint-plugin": "3.10.7",
- "@testing-library/dom": "^7.16.2", - "@testing-library/dom": "^7.16.2",
- "@types/jest": "^26.0.24", - "@types/jest": "^27.5.1",
- "@vue/test-utils": "1.3.0", - "@vue/test-utils": "1.3.0",
- "acorn": "^6.3.0", - "@vue/vue2-jest": "^27.0.0",
- "ajv": "^8.10.0", - "ajv": "^8.10.0",
- "ajv-formats": "^2.1.1", - "ajv-formats": "^2.1.1",
- "axios-mock-adapter": "^1.15.0", - "axios-mock-adapter": "^1.15.0",
- "babel-jest": "^26.5.2", - "babel-jest": "^27.5.1",
- "chalk": "^2.4.1", - "chalk": "^2.4.1",
- "cheerio": "^1.0.0-rc.9", - "cheerio": "^1.0.0-rc.9",
- "commander": "^2.20.3", - "commander": "^2.20.3",
- "custom-jquery-matchers": "^2.1.0", - "custom-jquery-matchers": "^2.1.0",
- "docdash": "^1.0.2", - "eslint": "8.22.0",
- "eslint": "7.32.0",
- "eslint-import-resolver-jest": "3.0.2", - "eslint-import-resolver-jest": "3.0.2",
- "eslint-import-resolver-webpack": "0.13.2", - "eslint-import-resolver-webpack": "0.13.2",
- "eslint-plugin-no-jquery": "2.7.0", - "eslint-plugin-no-jquery": "2.7.0",
@ -32,35 +31,32 @@ These are not required in production
- "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-coverage": "^3.0.0",
- "istanbul-lib-report": "^3.0.0", - "istanbul-lib-report": "^3.0.0",
- "istanbul-reports": "^3.0.0", - "istanbul-reports": "^3.0.0",
- "jest": "^26.5.2", - "jest": "^27.5.1",
- "jest-canvas-mock": "^2.1.2", - "jest-canvas-mock": "^2.1.2",
- "jest-diff": "^27.4.6", - "jest-diff": "^27.5.1",
- "jest-environment-jsdom": "^26.5.2", - "jest-environment-jsdom": "^27.5.1",
- "jest-jasmine2": "^27.5.1",
- "jest-junit": "^12.0.0", - "jest-junit": "^12.0.0",
- "jest-raw-loader": "^1.0.1", - "jest-raw-loader": "^1.0.1",
- "jest-transform-graphql": "^2.1.0", - "jest-transform-graphql": "^2.1.0",
- "jest-util": "^26.5.2", - "jest-util": "^27.5.1",
- "jsdoc": "^3.5.5",
- "jsdoc-vue": "^1.0.0",
- "markdownlint-cli": "0.31.0", - "markdownlint-cli": "0.31.0",
- "md5": "^2.2.1",
- "miragejs": "^0.1.40", - "miragejs": "^0.1.40",
- "mock-apollo-client": "1.2.0", - "mock-apollo-client": "1.2.0",
- "nodemon": "^2.0.4", - "nodemon": "^2.0.19",
- "prettier": "2.2.1", - "prettier": "2.2.1",
- "prosemirror-schema-basic": "^1.1.2", - "prosemirror-schema-basic": "^1.2.0",
- "prosemirror-schema-list": "^1.1.6", - "prosemirror-schema-list": "^1.2.0",
- "prosemirror-test-builder": "^1.0.6", - "prosemirror-test-builder": "^1.1.0",
- "purgecss": "^4.0.3", - "purgecss": "^4.0.3",
- "purgecss-from-html": "^4.0.3", - "purgecss-from-html": "^4.0.3",
- "sass": "^1.49.9", - "sass": "^1.49.9",
- "stylelint": "^14.9.1", - "stylelint": "^14.9.1",
- "timezone-mock": "^1.0.8", - "timezone-mock": "^1.0.8",
- "vue-jest": "4.0.1", - "webpack-dev-server": "4.10.0",
- "webpack-dev-server": "4.9.3",
- "xhr-mock": "^2.5.1", - "xhr-mock": "^2.5.1",
- "yarn-check-webpack-plugin": "^1.2.0", - "yarn-check-webpack-plugin": "^1.2.0",
- "yarn-deduplicate": "^5.0.0" - "yarn-deduplicate": "^5.0.2"
- }, - },
+ }, + },
"blockedDependencies": { "blockedDependencies": {

55
debian/patches/nodejs/0040-use-packaged-modules.patch vendored
View file

@ -62,7 +62,7 @@ Use debian packaged node modules when available
loader: 'file-loader', loader: 'file-loader',
options: { options: {
name: '[name].[contenthash:8].[ext]', name: '[name].[contenthash:8].[ext]',
@@ -664,19 +670,6 @@ @@ -667,19 +673,6 @@
}, },
}, },
@ -82,7 +82,7 @@ Use debian packaged node modules when available
new webpack.DefinePlugin({ new webpack.DefinePlugin({
// These are used to define window.gon.ee, window.gon.jh and other things properly in tests: // These are used to define window.gon.ee, window.gon.jh and other things properly in tests:
'process.env.IS_EE': JSON.stringify(IS_EE), 'process.env.IS_EE': JSON.stringify(IS_EE),
@@ -744,6 +737,7 @@ @@ -747,6 +740,7 @@
node: { node: {
fs: 'empty', // editorconfig requires 'fs' fs: 'empty', // editorconfig requires 'fs'
@ -102,30 +102,26 @@ Use debian packaged node modules when available
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -47,14 +47,18 @@ @@ -47,14 +47,14 @@
},
"dependencies": { "dependencies": {
"@_ueberdosis/prosemirror-tables": "^1.1.3",
"@apollo/client": "^3.5.10", "@apollo/client": "^3.5.10",
- "@babel/core": "^7.18.5", - "@babel/core": "^7.18.5",
- "@babel/preset-env": "^7.18.2", - "@babel/preset-env": "^7.18.2",
+ "@babel/core": "link:/usr/share/nodejs/@babel/core", + "@babel/core": "link:/usr/share/nodejs/@babel/core",
+ "@babel/plugin-proposal-class-properties": "link:/usr/share/nodejs/@babel/plugin-proposal-class-properties",
+ "@babel/plugin-proposal-json-strings": "link:/usr/share/nodejs/@babel/plugin-proposal-json-strings",
+ "@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", + "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
"@gitlab/at.js": "1.5.7", "@gitlab/at.js": "1.5.7",
"@gitlab/favicon-overlay": "2.0.0", "@gitlab/favicon-overlay": "2.0.0",
"@gitlab/svgs": "2.28.0", "@gitlab/svgs": "3.1.0",
"@gitlab/ui": "42.22.0", "@gitlab/ui": "43.6.0",
"@gitlab/visual-review-tools": "1.7.3", "@gitlab/visual-review-tools": "1.7.3",
- "@rails/actioncable": "6.1.4-7", - "@rails/actioncable": "6.1.4-7",
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable", + "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
"@rails/ujs": "6.1.4-7", "@rails/ujs": "6.1.4-7",
"@sentry/browser": "5.30.0", "@sentry/browser": "5.30.0",
"@sourcegraph/code-host-integration": "0.0.60", "@sourcegraph/code-host-integration": "0.0.60",
@@ -93,24 +97,24 @@ @@ -92,23 +92,23 @@
"aws-sdk": "^2.637.0", "autosize": "^5.0.1",
"axios": "^0.24.0", "axios": "^0.24.0",
"babel-loader": "^8.2.5", "babel-loader": "^8.2.5",
- "babel-plugin-lodash": "^3.3.4", - "babel-plugin-lodash": "^3.3.4",
@ -134,13 +130,11 @@ Use debian packaged node modules when available
"cache-loader": "^4.1.0", "cache-loader": "^4.1.0",
"canvas-confetti": "^1.4.0", "canvas-confetti": "^1.4.0",
- "clipboard": "^2.0.8", - "clipboard": "^2.0.8",
- "codemirror": "^5.48.4",
+ "clipboard": "link:/usr/share/nodejs/clipboard", + "clipboard": "link:/usr/share/nodejs/clipboard",
+ "codemirror": "link:/usr/share/nodejs/codemirror",
"codesandbox-api": "0.0.23", "codesandbox-api": "0.0.23",
"compression-webpack-plugin": "^5.0.2", "compression-webpack-plugin": "^5.0.2",
"copy-webpack-plugin": "^6.4.1", "copy-webpack-plugin": "^6.4.1",
"core-js": "^3.23.5", "core-js": "^3.24.1",
- "cron-validator": "^1.1.1", - "cron-validator": "^1.1.1",
+ "cron-validator": "link:/usr/share/nodejs/cron-validator", + "cron-validator": "link:/usr/share/nodejs/cron-validator",
"cronstrue": "^1.122.0", "cronstrue": "^1.122.0",
@ -156,8 +150,8 @@ Use debian packaged node modules when available
+ "dateformat": "link:/usr/share/nodejs/dateformat", + "dateformat": "link:/usr/share/nodejs/dateformat",
"deckar01-task_list": "^2.3.1", "deckar01-task_list": "^2.3.1",
"diff": "^3.4.0", "diff": "^3.4.0",
"dompurify": "^2.3.9", "dompurify": "^2.3.10",
@@ -128,35 +132,35 @@ @@ -126,30 +126,30 @@
"jed": "^1.1.1", "jed": "^1.1.1",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"jquery.caret": "^0.3.1", "jquery.caret": "^0.3.1",
@ -173,15 +167,16 @@ Use debian packaged node modules when available
+ "katex": "link:/usr/share/nodejs/katex", + "katex": "link:/usr/share/nodejs/katex",
+ "lodash": "link:/usr/share/nodejs/lodash", + "lodash": "link:/usr/share/nodejs/lodash",
"lowlight": "^2.6.1", "lowlight": "^2.6.1",
"marked": "^0.3.12", "marked": "^4.0.18",
"mathjax": "3", "mathjax": "3",
"mermaid": "^9.1.1", "mdurl": "^1.0.1",
"mermaid": "^9.1.3",
"micromatch": "^4.0.5", "micromatch": "^4.0.5",
- "minimatch": "^3.0.4", - "minimatch": "^3.0.4",
+ "minimatch": "link:/usr/share/nodejs/minimatch", + "minimatch": "link:/usr/share/nodejs/minimatch",
"monaco-editor": "^0.25.2", "monaco-editor": "^0.30.1",
"monaco-editor-webpack-plugin": "^4.0.0", "monaco-editor-webpack-plugin": "^6.0.0",
"monaco-yaml": "^2.5.1", "monaco-yaml": "3.0.0",
"mousetrap": "1.6.5", "mousetrap": "1.6.5",
"papaparse": "^5.3.1", "papaparse": "^5.3.1",
"patch-package": "^6.4.7", "patch-package": "^6.4.7",
@ -194,19 +189,9 @@ Use debian packaged node modules when available
- "postcss": "8.4.14", - "postcss": "8.4.14",
+ "postcss": "link:/usr/share/nodejs/postcss", + "postcss": "link:/usr/share/nodejs/postcss",
"prismjs": "^1.21.0", "prismjs": "^1.21.0",
- "prosemirror-markdown": "1.8.0", "prosemirror-markdown": "1.9.1",
- "prosemirror-model": "^1.16.1", "prosemirror-model": "^1.18.1",
- "prosemirror-state": "^1.3.4", @@ -170,27 +170,26 @@
+ "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
+ "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
+ "prosemirror-state": "link:/usr/share/nodejs/prosemirror-state",
"prosemirror-tables": "^1.1.1",
- "prosemirror-view": "^1.23.13",
+ "prosemirror-view": "link:/usr/share/nodejs/prosemirror-view",
"raphael": "^2.2.7",
"raw-loader": "^4.0.2",
"rehype-raw": "^6.1.1",
@@ -171,27 +175,26 @@
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
"swagger-ui-dist": "4.12.0", "swagger-ui-dist": "4.12.0",
"three": "^0.84.0", "three": "^0.84.0",

13
debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch vendored
View file

@ -1,13 +0,0 @@
4.2.0 is not compatible with the installed monaco-editor module
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
"micromatch": "^4.0.5",
"minimatch": "link:/usr/share/nodejs/minimatch",
"monaco-editor": "^0.25.2",
- "monaco-editor-webpack-plugin": "^4.0.0",
+ "monaco-editor-webpack-plugin": "4.0.0",
"monaco-yaml": "^2.5.1",
"mousetrap": "1.6.5",
"papaparse": "^5.3.1",

1
debian/patches/series vendored
View file

@ -15,7 +15,6 @@ nodejs/0010-set-webpack-root.patch
nodejs/0020-remove-dev-dependencies.patch nodejs/0020-remove-dev-dependencies.patch
nodejs/0030-use-yarnpkg.patch nodejs/0030-use-yarnpkg.patch
nodejs/0040-use-packaged-modules.patch nodejs/0040-use-packaged-modules.patch
nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch
tweaks/0010-source-init-functions.patch tweaks/0010-source-init-functions.patch
tweaks/0020-fix-mail-room-path.patch tweaks/0020-fix-mail-room-path.patch
tweaks/0030-fix-gitlab-yml-path.patch tweaks/0030-fix-gitlab-yml-path.patch