Refresh patches
This commit is contained in:
Pirate Praveen
parent
ec5a9ffc08
commit
2609e0e449
18 changed files with 114 additions and 116 deletions
117
debian/patches/Gemfile/0010-relax-stable-libs.patch
vendored
117
debian/patches/Gemfile/0010-relax-stable-libs.patch
vendored
|
|
@ -10,8 +10,8 @@ gitlab Gemfile
|
|||
-gem 'rails', '~> 6.1.6.1'
|
||||
+gem 'rails', '~> 6.1.6', '>= 6.1.6.1'
|
||||
|
||||
-gem 'bootsnap', '~> 1.13.0', require: false
|
||||
+gem 'bootsnap', '~> 1.13', require: false
|
||||
-gem 'bootsnap', '~> 1.15.0', require: false
|
||||
+gem 'bootsnap', '~> 1.15', require: false
|
||||
|
||||
# Pin openssl to match the version bundled with our supported Rubies.
|
||||
# See https://stdgems.org/openssl/#gem-version.
|
||||
|
|
@ -23,7 +23,7 @@ gitlab Gemfile
|
|||
+gem 'sprockets', '~> 3.7'
|
||||
|
||||
-gem 'view_component', '~> 2.74.1'
|
||||
+gem 'view_component', '~> 2.74'
|
||||
+gem 'view_component', '~> 2.74','>= 2.74.1'
|
||||
|
||||
# Default values for AR models
|
||||
-gem 'default_value_for', '~> 3.4.0'
|
||||
|
|
@ -50,14 +50,12 @@ gitlab Gemfile
|
|||
+gem 'devise', '~> 4.8', '>= 4.8.1'
|
||||
gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable'
|
||||
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
|
||||
-gem 'doorkeeper', '~> 5.5.0.rc2'
|
||||
-gem 'doorkeeper-openid_connect', '~> 1.7.5'
|
||||
gem 'doorkeeper', '~> 5.5'
|
||||
gem 'doorkeeper-openid_connect', '~> 1.8'
|
||||
-gem 'rexml', '~> 3.2.5'
|
||||
-gem 'ruby-saml', '~> 1.13.0'
|
||||
-gem 'omniauth', '~> 2.1.0'
|
||||
-gem 'omniauth-auth0', '~> 2.0.0'
|
||||
+gem 'doorkeeper', '~> 5.5'
|
||||
+gem 'doorkeeper-openid_connect', '~> 1.7','>= 1.7.5'
|
||||
+gem 'rexml', '~> 3.2','>= 3.2.5'
|
||||
+gem 'ruby-saml', '~> 1.13'
|
||||
+gem 'omniauth', '~> 2.1'
|
||||
|
|
@ -92,7 +90,7 @@ gitlab Gemfile
|
|||
|
||||
# Kerberos authentication. EE-only
|
||||
gem 'gssapi', group: :kerberos
|
||||
@@ -86,17 +86,17 @@
|
||||
@@ -86,72 +86,72 @@
|
||||
# Spam and anti-bot protection
|
||||
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
|
||||
gem 'akismet', '~> 3.0'
|
||||
|
|
@ -114,20 +112,23 @@ gitlab Gemfile
|
|||
# GitLab Pages letsencrypt support
|
||||
gem 'acme-client', '~> 2.0'
|
||||
|
||||
@@ -107,25 +107,25 @@
|
||||
# Browser detection
|
||||
-gem 'browser', '~> 5.3.1'
|
||||
+gem 'browser', '~> 5.3', '>= 5.3.1'
|
||||
|
||||
# OS detection for usage ping
|
||||
gem 'ohai', '~> 16.10'
|
||||
|
||||
# GPG
|
||||
-gem 'gpgme', '~> 2.0.19'
|
||||
+gem 'gpgme', '~> 2.0','>= 2.0.19'
|
||||
-gem 'gpgme', '~> 2.0.22'
|
||||
+gem 'gpgme', '~> 2.0', '>= 2.0.22'
|
||||
|
||||
# LDAP Auth
|
||||
# GitLab fork with several improvements to original library. For full list of changes
|
||||
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
|
||||
-gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap'
|
||||
-gem 'net-ldap', '~> 0.16.3'
|
||||
+gem 'gitlab_omniauth-ldap', '~> 2.2', require: 'omniauth-ldap'
|
||||
+gem 'net-ldap', '~> 0.16', '>= 0.16.3'
|
||||
gem 'net-ldap', '~> 0.16.3'
|
||||
|
||||
# API
|
||||
-gem 'grape', '~> 1.5.2'
|
||||
|
|
@ -147,8 +148,12 @@ gitlab Gemfile
|
|||
gem 'graphql-docs', '~> 2.1.0', group: [:development, :test]
|
||||
gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
|
||||
|
||||
@@ -135,23 +135,23 @@
|
||||
gem 'kaminari', '~> 1.2.2'
|
||||
-gem 'hashie', '~> 5.0.0'
|
||||
+gem 'hashie', '~> 5.0'
|
||||
|
||||
# Pagination
|
||||
-gem 'kaminari', '~> 1.2.2'
|
||||
+gem 'kaminari', '~> 1.2', '>= 1.2.2'
|
||||
|
||||
# HAML
|
||||
-gem 'hamlit', '~> 2.15.0'
|
||||
|
|
@ -186,12 +191,12 @@ gitlab Gemfile
|
|||
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.167.0'
|
||||
-gem 'aws-sdk-core', '~> 3.168.4'
|
||||
+gem 'elasticsearch-api', '~> 7.13', '>= 7.13.3'
|
||||
+gem 'aws-sdk-core', '~> 3.167'
|
||||
+gem 'aws-sdk-core', '~> 3.168', '>= 3.168.4'
|
||||
gem 'aws-sdk-cloudformation', '~> 1'
|
||||
-gem 'aws-sdk-s3', '~> 1.117.1'
|
||||
+gem 'aws-sdk-s3', '~> 1.117'
|
||||
-gem 'aws-sdk-s3', '~> 1.117.2'
|
||||
+gem 'aws-sdk-s3', '~> 1.117', '>= 1.117.2'
|
||||
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
|
||||
|
|
@ -223,9 +228,9 @@ gitlab Gemfile
|
|||
+gem 'rouge', '~> 3.30'
|
||||
gem 'truncato', '~> 0.7.12'
|
||||
-gem 'bootstrap_form', '~> 4.2.0'
|
||||
-gem 'nokogiri', '~> 1.13.9'
|
||||
-gem 'nokogiri', '~> 1.13.10'
|
||||
+gem 'bootstrap_form', '~> 4.2'
|
||||
+gem 'nokogiri', '~> 1.3','>= 1.13.9'
|
||||
+gem 'nokogiri', '~> 1.13', '>= 1.13.10'
|
||||
|
||||
# Calendar rendering
|
||||
gem 'icalendar'
|
||||
|
|
@ -262,7 +267,7 @@ gitlab Gemfile
|
|||
|
||||
# HTTP requests
|
||||
gem 'httparty', '~> 0.20.0'
|
||||
@@ -235,14 +235,14 @@
|
||||
@@ -235,10 +235,10 @@
|
||||
gem 'ruby-progressbar', '~> 1.10'
|
||||
|
||||
# GitLab settings
|
||||
|
|
@ -275,12 +280,7 @@ gitlab Gemfile
|
|||
|
||||
# Misc
|
||||
|
||||
-gem 'version_sorter', '~> 2.2.4'
|
||||
+gem 'version_sorter', '~> 2.2', '>= 2.2.4'
|
||||
|
||||
# Export Ruby Regex to Javascript
|
||||
gem 'js_regex', '~> 3.8'
|
||||
@@ -251,24 +251,24 @@
|
||||
@@ -251,21 +251,21 @@
|
||||
gem 'device_detector'
|
||||
|
||||
# Redis
|
||||
|
|
@ -300,34 +300,22 @@ gitlab Gemfile
|
|||
+gem 'jira-ruby', '~> 2.1', '>= 2.1.4'
|
||||
gem 'atlassian-jwt', '~> 0.2.0'
|
||||
|
||||
# Flowdock integration
|
||||
gem 'flowdock', '~> 0.7'
|
||||
|
||||
# Slack integration
|
||||
-gem 'slack-messenger', '~> 2.3.4'
|
||||
+gem 'slack-messenger', '~> 2.3', '>= 2.3.4'
|
||||
|
||||
# Hangouts Chat integration
|
||||
gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
|
||||
@@ -280,14 +280,14 @@
|
||||
gem 'ruby-fogbugz', '~> 0.3.0'
|
||||
|
||||
# Kubernetes integration
|
||||
-gem 'kubeclient', '~> 4.9.3'
|
||||
+gem 'kubeclient', '~> 4.9','>= 4.9.3'
|
||||
|
||||
# Sanitize user input
|
||||
gem 'sanitize', '~> 6.0'
|
||||
-gem 'babosa', '~> 1.0.4'
|
||||
+gem 'babosa', '~> 1.0','>= 1.0.4'
|
||||
@@ -284,7 +284,7 @@
|
||||
gem 'babosa', '~> 1.0.4'
|
||||
|
||||
# Sanitizes SVG input
|
||||
-gem 'loofah', '~> 2.19.0'
|
||||
+gem 'loofah', '~> 2.19'
|
||||
-gem 'loofah', '~> 2.19.1'
|
||||
+gem 'loofah', '~> 2.19', '>= 2.19.1'
|
||||
|
||||
# Working with license
|
||||
# Detects the open source license the repository includes
|
||||
@@ -309,32 +309,32 @@
|
||||
@@ -306,32 +306,32 @@
|
||||
|
||||
gem 'rack-proxy', '~> 0.7.4'
|
||||
|
||||
|
|
@ -370,7 +358,7 @@ gitlab Gemfile
|
|||
|
||||
gem 'gitlab-labkit', '~> 0.29.0'
|
||||
gem 'thrift', '>= 0.16.0'
|
||||
@@ -342,11 +342,11 @@
|
||||
@@ -339,11 +339,11 @@
|
||||
# I18n
|
||||
gem 'ruby_parser', '~> 3.15', require: false
|
||||
gem 'rails-i18n', '~> 7.0'
|
||||
|
|
@ -384,20 +372,20 @@ gitlab Gemfile
|
|||
|
||||
# Perf bar
|
||||
gem 'peek', '~> 1.1'
|
||||
@@ -355,10 +355,10 @@
|
||||
gem 'snowplow-tracker', '~> 0.6.1'
|
||||
@@ -352,10 +352,10 @@
|
||||
gem 'snowplow-tracker', '~> 0.8.0'
|
||||
|
||||
# Metrics
|
||||
-gem 'webrick', '~> 1.6.1', require: false
|
||||
+gem 'webrick', '~> 1.6', '>= 1.6.1', require: false
|
||||
gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client'
|
||||
gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client'
|
||||
|
||||
-gem 'warning', '~> 1.3.0'
|
||||
+gem 'warning', '~> 1.3'
|
||||
|
||||
group :development do
|
||||
gem 'lefthook', '~> 1.2.0', require: false
|
||||
@@ -440,24 +440,24 @@
|
||||
gem 'lefthook', '~> 1.2.6', require: false
|
||||
@@ -437,24 +437,24 @@
|
||||
end
|
||||
|
||||
group :test do
|
||||
|
|
@ -433,7 +421,7 @@ gitlab Gemfile
|
|||
gem 'rspec_junit_formatter'
|
||||
gem 'guard-rspec'
|
||||
|
||||
@@ -486,8 +486,8 @@
|
||||
@@ -483,8 +483,8 @@
|
||||
gem 'health_check', '~> 3.0'
|
||||
|
||||
# System information
|
||||
|
|
@ -444,7 +432,7 @@ gitlab Gemfile
|
|||
|
||||
# NTP client
|
||||
gem 'net-ntp'
|
||||
@@ -496,15 +496,15 @@
|
||||
@@ -493,25 +493,25 @@
|
||||
gem 'ssh_data', '~> 1.3'
|
||||
|
||||
# Spamcheck GRPC protocol definitions
|
||||
|
|
@ -461,9 +449,12 @@ gitlab Gemfile
|
|||
-gem 'grpc', '~> 1.42.0'
|
||||
+gem 'grpc', '~> 1.42'
|
||||
|
||||
gem 'google-protobuf', '~> 3.21', '>= 3.21.9'
|
||||
gem 'google-protobuf', '~> 3.21', '>= 3.21.12'
|
||||
|
||||
@@ -514,7 +514,7 @@
|
||||
-gem 'toml-rb', '~> 2.2.0'
|
||||
+gem 'toml-rb', '~> 2.2'
|
||||
|
||||
# Feature toggles
|
||||
gem 'flipper', '~> 0.25.0'
|
||||
gem 'flipper-active_record', '~> 0.25.0'
|
||||
gem 'flipper-active_support_cache_store', '~> 0.25.0'
|
||||
|
|
@ -472,7 +463,19 @@ gitlab Gemfile
|
|||
gem 'gitlab-experiment', '~> 0.7.1'
|
||||
|
||||
# Structured logging
|
||||
@@ -547,12 +547,12 @@
|
||||
@@ -522,9 +522,9 @@
|
||||
gem 'gitlab-net-dns', '~> 0.9.1'
|
||||
|
||||
# Countries list
|
||||
-gem 'countries', '~> 4.0.0'
|
||||
+gem 'countries', '~> 4.0'
|
||||
|
||||
-gem 'retriable', '~> 3.1.2'
|
||||
+gem 'retriable', '~> 3.1', '>= 3.1.2'
|
||||
|
||||
# LRU cache
|
||||
gem 'lru_redux'
|
||||
@@ -544,12 +544,12 @@
|
||||
gem 'valid_email', '~> 0.1'
|
||||
|
||||
# JSON
|
||||
|
|
@ -489,7 +492,7 @@ gitlab Gemfile
|
|||
|
||||
gem 'webauthn', '~> 2.3'
|
||||
|
||||
@@ -563,14 +563,14 @@
|
||||
@@ -560,14 +560,14 @@
|
||||
|
||||
gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'
|
||||
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ Bundler will fail when it can't find these locally
|
|||
-gem 'graphql-docs', '~> 2.1.0', group: [:development, :test]
|
||||
gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
|
||||
|
||||
gem 'hashie', '~> 5.0.0'
|
||||
@@ -344,7 +341,6 @@
|
||||
gem 'hashie', '~> 5.0'
|
||||
@@ -341,7 +338,6 @@
|
||||
gem 'rails-i18n', '~> 7.0'
|
||||
gem 'gettext_i18n_rails', '~> 1.8'
|
||||
gem 'gettext_i18n_rails_js', '~> 1.3'
|
||||
|
|
@ -25,12 +25,12 @@ Bundler will fail when it can't find these locally
|
|||
|
||||
gem 'batch-loader', '~> 2.0', '>= 2.0.1'
|
||||
|
||||
@@ -360,85 +356,6 @@
|
||||
@@ -357,85 +353,6 @@
|
||||
|
||||
gem 'warning', '~> 1.3'
|
||||
|
||||
-group :development do
|
||||
- gem 'lefthook', '~> 1.2.0', require: false
|
||||
- gem 'lefthook', '~> 1.2.6', require: false
|
||||
- gem 'rubocop'
|
||||
- gem 'solargraph', '~> 0.47.2', require: false
|
||||
-
|
||||
|
|
@ -41,6 +41,8 @@ Bundler will fail when it can't find these locally
|
|||
- gem 'better_errors', '~> 2.9.1'
|
||||
-
|
||||
- gem 'sprite-factory', '~> 1.7'
|
||||
-
|
||||
- gem "listen", "~> 3.7"
|
||||
-end
|
||||
-
|
||||
-group :development, :test do
|
||||
|
|
@ -62,10 +64,10 @@ Bundler will fail when it can't find these locally
|
|||
- # Generate Fake data
|
||||
- gem 'ffaker', '~> 2.10'
|
||||
-
|
||||
- gem 'spring', '~> 2.1.0'
|
||||
- gem 'spring', '~> 4.1.0'
|
||||
- gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
-
|
||||
- gem 'gitlab-styles', '~> 9.0.0', require: false
|
||||
- gem 'gitlab-styles', '~> 9.1.0', require: false
|
||||
-
|
||||
- gem 'haml_lint', '~> 0.40.0', require: false
|
||||
- gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
|
|
@ -79,8 +81,6 @@ Bundler will fail when it can't find these locally
|
|||
-
|
||||
- gem 'simple_po_parser', '~> 1.1.6', require: false
|
||||
-
|
||||
- gem 'timecop', '~> 0.9.1'
|
||||
-
|
||||
- gem 'png_quantizator', '~> 0.2.1', require: false
|
||||
-
|
||||
- gem 'parallel', '~> 1.19', require: false
|
||||
|
|
@ -93,7 +93,7 @@ Bundler will fail when it can't find these locally
|
|||
-end
|
||||
-
|
||||
-group :development, :test, :danger do
|
||||
- gem 'gitlab-dangerfiles', '~> 3.6.2', require: false
|
||||
- gem 'gitlab-dangerfiles', '~> 3.6.4', require: false
|
||||
-end
|
||||
-
|
||||
-group :development, :test, :coverage do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -356,7 +356,7 @@
|
||||
@@ -353,7 +353,7 @@
|
||||
|
||||
gem 'warning', '~> 1.3'
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ This gem is used only in gitlab Enterprise Edition
|
|||
gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
|
||||
|
||||
# Spam and anti-bot protection
|
||||
@@ -316,8 +315,6 @@
|
||||
@@ -313,8 +312,6 @@
|
||||
gem 'request_store', '~> 1.5.1'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -360,7 +360,7 @@
|
||||
@@ -357,7 +357,7 @@
|
||||
gem 'rspec-benchmark', '~> 0.6.0'
|
||||
gem 'rspec-parameterized', require: false
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -361,7 +361,6 @@
|
||||
@@ -358,7 +358,6 @@
|
||||
gem 'rspec-parameterized', require: false
|
||||
|
||||
gem 'capybara', '~> 3.12'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -372,7 +372,6 @@
|
||||
@@ -369,7 +369,6 @@
|
||||
gem 'concurrent-ruby', '~> 1.1'
|
||||
gem 'test-prof', '~> 1.0', '>= 1.0.7'
|
||||
gem 'rspec_junit_formatter'
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ libruby2.7 has rexml 3.2.3.1 which has latest security fixes
|
|||
@@ -54,7 +54,7 @@
|
||||
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
|
||||
gem 'doorkeeper', '~> 5.5'
|
||||
gem 'doorkeeper-openid_connect', '~> 1.7','>= 1.7.5'
|
||||
gem 'doorkeeper-openid_connect', '~> 1.8'
|
||||
-gem 'rexml', '~> 3.2','>= 3.2.5'
|
||||
+gem 'rexml', '~> 3.2','>= 3.2.3.1'
|
||||
gem 'ruby-saml', '~> 1.13'
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Rakefile need this gem
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -493,5 +493,8 @@
|
||||
@@ -490,5 +490,8 @@
|
||||
# Apple plist parsing
|
||||
gem 'CFPropertyList'
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ We have to use openssl available in the archive
|
|||
|
||||
# Pin openssl to match the version bundled with our supported Rubies.
|
||||
# See https://stdgems.org/openssl/#gem-version.
|
||||
-gem 'openssl', '2.2.1'
|
||||
+# gem 'openssl', '2.2.1'
|
||||
-gem 'openssl', '2.2.2'
|
||||
+#gem 'openssl', '2.2.2'
|
||||
# This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3.
|
||||
# Since the latest version caused problems with GitLab, we pin this to an older
|
||||
# version for now.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ These are not required in production
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -205,59 +205,6 @@
|
||||
@@ -209,60 +209,7 @@
|
||||
"yaml": "^2.0.0-10"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
@ -10,36 +10,36 @@ These are not required in production
|
|||
- "@gitlab/stylelint-config": "4.1.0",
|
||||
- "@graphql-eslint/eslint-plugin": "3.12.0",
|
||||
- "@testing-library/dom": "^7.16.2",
|
||||
- "@types/jest": "^27.5.1",
|
||||
- "@types/jest": "^28.1.3",
|
||||
- "@vue/test-utils": "1.3.0",
|
||||
- "@vue/vue2-jest": "^27.0.0",
|
||||
- "@vue/vue2-jest": "^28.1.0",
|
||||
- "ajv": "^8.10.0",
|
||||
- "ajv-formats": "^2.1.1",
|
||||
- "axios-mock-adapter": "^1.15.0",
|
||||
- "babel-jest": "^27.5.1",
|
||||
- "babel-jest": "^28.1.3",
|
||||
- "chalk": "^2.4.1",
|
||||
- "cheerio": "^1.0.0-rc.9",
|
||||
- "commander": "^2.20.3",
|
||||
- "custom-jquery-matchers": "^2.1.0",
|
||||
- "eslint": "8.26.0",
|
||||
- "eslint": "8.28.0",
|
||||
- "eslint-import-resolver-jest": "3.0.2",
|
||||
- "eslint-import-resolver-webpack": "0.13.2",
|
||||
- "eslint-plugin-import": "^2.26.0",
|
||||
- "eslint-plugin-no-jquery": "2.7.0",
|
||||
- "eslint-plugin-no-unsanitized": "^4.0.1",
|
||||
- "eslint-plugin-no-unsanitized": "^4.0.2",
|
||||
- "gettext-extractor": "^3.5.3",
|
||||
- "gettext-extractor-vue": "^5.0.0",
|
||||
- "glob": "^7.1.6",
|
||||
- "istanbul-lib-coverage": "^3.0.0",
|
||||
- "istanbul-lib-report": "^3.0.0",
|
||||
- "istanbul-reports": "^3.0.0",
|
||||
- "jest": "^27.5.1",
|
||||
- "jest-canvas-mock": "^2.1.2",
|
||||
- "jest-diff": "^27.5.1",
|
||||
- "jest-environment-jsdom": "^27.5.1",
|
||||
- "jest-jasmine2": "^27.5.1",
|
||||
- "jest-junit": "^12.0.0",
|
||||
- "jest-util": "^27.5.1",
|
||||
- "jest": "^28.1.3",
|
||||
- "jest-canvas-mock": "^2.4.0",
|
||||
- "jest-diff": "^28.1.3",
|
||||
- "jest-environment-jsdom": "^28.1.3",
|
||||
- "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",
|
||||
|
|
@ -59,13 +59,8 @@ 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"
|
||||
@@ -270,4 +217,4 @@
|
||||
"node": ">=12.22.1",
|
||||
"yarn": "^1.10.0"
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
@@ -283,6 +282,8 @@
|
||||
@@ -289,6 +288,8 @@
|
||||
|
||||
entry: generateEntries,
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ Use debian packaged node modules when available
|
|||
output: {
|
||||
path: WEBPACK_OUTPUT_PATH,
|
||||
publicPath: WEBPACK_PUBLIC_PATH,
|
||||
@@ -294,10 +295,15 @@
|
||||
@@ -300,10 +301,15 @@
|
||||
},
|
||||
|
||||
resolve: {
|
||||
|
|
@ -53,7 +53,7 @@ Use debian packaged node modules when available
|
|||
module: {
|
||||
strictExportPresence: true,
|
||||
rules: [
|
||||
@@ -412,7 +418,7 @@
|
||||
@@ -419,7 +425,7 @@
|
||||
},
|
||||
{
|
||||
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]',
|
||||
@@ -832,6 +838,7 @@
|
||||
@@ -840,6 +846,7 @@
|
||||
|
||||
node: {
|
||||
fs: 'empty', // editorconfig requires 'fs'
|
||||
|
|
@ -83,7 +83,7 @@ Use debian packaged node modules when available
|
|||
components: { Page },
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -48,8 +48,8 @@
|
||||
@@ -49,8 +49,8 @@
|
||||
"dependencies": {
|
||||
"@_ueberdosis/prosemirror-tables": "^1.1.3",
|
||||
"@apollo/client": "^3.5.10",
|
||||
|
|
@ -92,14 +92,14 @@ Use debian packaged node modules when available
|
|||
+ "@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.0",
|
||||
"@gitlab/at.js": "1.5.7",
|
||||
"@gitlab/favicon-overlay": "2.0.0",
|
||||
@@ -57,7 +57,7 @@
|
||||
"@gitlab/ui": "49.10.0",
|
||||
@@ -60,7 +60,7 @@
|
||||
"@gitlab/ui": "52.6.0",
|
||||
"@gitlab/visual-review-tools": "1.7.3",
|
||||
"@gitlab/web-ide": "0.0.1-dev-20221114183058",
|
||||
"@gitlab/web-ide": "0.0.1-dev-20221217175648",
|
||||
- "@rails/actioncable": "6.1.4-7",
|
||||
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
|
||||
"@rails/ujs": "6.1.4-7",
|
||||
"@sentry/browser": "5.30.0",
|
||||
"@sourcegraph/code-host-integration": "0.0.84",
|
||||
"@tiptap/core": "^2.0.0-beta.182",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -49,6 +49,10 @@
|
||||
@@ -50,6 +50,10 @@
|
||||
"@_ueberdosis/prosemirror-tables": "^1.1.3",
|
||||
"@apollo/client": "^3.5.10",
|
||||
"@babel/core": "link:/usr/share/nodejs/@babel/core",
|
||||
|
|
@ -10,4 +10,4 @@
|
|||
+ "@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",
|
||||
"@gitlab/at.js": "1.5.7",
|
||||
"@cubejs-client/core": "^0.31.0",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ yaml from npm registry needs a newer nodejs than what is in bullseye
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -206,7 +206,7 @@
|
||||
@@ -210,7 +210,7 @@
|
||||
"webpack-stats-plugin": "^0.3.1",
|
||||
"worker-loader": "^2.0.0",
|
||||
"xterm": "3.14.5",
|
||||
|
|
@ -10,4 +10,4 @@ yaml from npm registry needs a newer nodejs than what is in bullseye
|
|||
+ "yaml": "link:/usr/share/nodejs/yaml"
|
||||
},
|
||||
"devDependencies": {
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -143,7 +143,7 @@
|
||||
@@ -145,7 +145,7 @@
|
||||
"js-cookie": "^3.0.0",
|
||||
"js-yaml": "^3.13.1",
|
||||
"jszip": "^3.1.3",
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -65,39 +65,39 @@
|
||||
@@ -67,39 +67,39 @@
|
||||
"@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
|
||||
"@rails/ujs": "6.1.4-7",
|
||||
"@sentry/browser": "5.30.0",
|
||||
"@sourcegraph/code-host-integration": "0.0.84",
|
||||
- "@tiptap/core": "^2.0.0-beta.182",
|
||||
+ "@tiptap/core": "2.0.0-beta.182",
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
"apollo-upload-client": "15.0.0",
|
||||
"autosize": "^5.0.1",
|
||||
"axios": "^0.24.0",
|
||||
@@ -215,7 +215,11 @@
|
||||
@@ -219,7 +219,11 @@
|
||||
},
|
||||
"resolutions": {
|
||||
"chokidar": "^3.5.3",
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Last-Update: 2018-12-16
|
|||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
--- a/app/helpers/version_check_helper.rb
|
||||
+++ b/app/helpers/version_check_helper.rb
|
||||
@@ -9,7 +9,10 @@
|
||||
@@ -24,7 +24,10 @@
|
||||
end
|
||||
|
||||
def link_to_version
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
require 'selenium-webdriver'
|
||||
|
||||
# Give CI some extra time
|
||||
@@ -118,18 +117,6 @@
|
||||
@@ -120,18 +119,6 @@
|
||||
Capybara.default_normalize_ws = true
|
||||
Capybara.enable_aria_label = true
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue