Refresh patches
This commit is contained in:
Pirate Praveen
parent
89d9cbce42
commit
2166516d83
27 changed files with 122 additions and 145 deletions
91
debian/patches/0050-relax-stable-libs.patch
vendored
91
debian/patches/0050-relax-stable-libs.patch
vendored
|
|
@ -26,9 +26,8 @@ gitlab Gemfile
|
|||
# Supported DBs
|
||||
gem 'pg', '~> 1.1'
|
||||
|
||||
-gem 'rugged', '~> 1.0.1'
|
||||
gem 'rugged', '~> 1.1'
|
||||
-gem 'grape-path-helpers', '~> 1.6.1'
|
||||
+gem 'rugged', '~> 1.0', '>= 1.0.1'
|
||||
+gem 'grape-path-helpers', '~> 1.6', '>= 1.6.1'
|
||||
|
||||
gem 'faraday', '~> 1.0'
|
||||
|
|
@ -38,13 +37,11 @@ gitlab Gemfile
|
|||
# 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 'bcrypt', '~> 3.1', '>= 3.1.14'
|
||||
-gem 'doorkeeper', '~> 5.5.0.rc2'
|
||||
-gem 'doorkeeper-openid_connect', '~> 1.7.5'
|
||||
-gem 'rexml', '~> 3.2.5'
|
||||
-gem 'ruby-saml', '~> 1.12.1'
|
||||
+gem 'bcrypt', '~> 3.1', '>= 3.1.12'
|
||||
+gem 'doorkeeper', '~> 5.5'
|
||||
+gem 'doorkeeper-openid_connect', '~> 1.7', '>= 1.7.5'
|
||||
+gem 'rexml', '~> 3.2', '>= 3.2.5'
|
||||
|
|
@ -52,7 +49,8 @@ gitlab Gemfile
|
|||
gem 'omniauth', '~> 1.8'
|
||||
-gem 'omniauth-auth0', '~> 2.0.0'
|
||||
+gem 'omniauth-auth0', '~> 2.0'
|
||||
gem 'omniauth-azure-oauth2', '~> 0.0.9'
|
||||
gem 'omniauth-azure-activedirectory-v2', '~> 0.1'
|
||||
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
|
||||
-gem 'omniauth-cas3', '~> 1.1.4'
|
||||
-gem 'omniauth-facebook', '~> 4.0.0'
|
||||
+gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4'
|
||||
|
|
@ -104,8 +102,8 @@ gitlab Gemfile
|
|||
# GitLab Pages letsencrypt support
|
||||
gem 'acme-client', '~> 2.0', '>= 2.0.6'
|
||||
|
||||
@@ -76,27 +76,27 @@
|
||||
gem 'browser', '~> 4.2'
|
||||
@@ -79,27 +79,27 @@
|
||||
gem 'ohai', '~> 16.10'
|
||||
|
||||
# GPG
|
||||
-gem 'gpgme', '~> 2.0.19'
|
||||
|
|
@ -126,8 +124,8 @@ gitlab Gemfile
|
|||
+gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
|
||||
|
||||
# GraphQL API
|
||||
-gem 'graphql', '~> 1.11.4'
|
||||
+gem 'graphql', '~> 1.11', '>= 1.11.4'
|
||||
-gem 'graphql', '~> 1.11.8'
|
||||
+gem 'graphql', '~> 1.11', '>= 1.11.8'
|
||||
# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
|
||||
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
|
||||
# https://gitlab.com/gitlab-org/gitlab/issues/31747
|
||||
|
|
@ -140,7 +138,7 @@ gitlab Gemfile
|
|||
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
|
||||
|
||||
gem 'hashie'
|
||||
@@ -107,11 +107,11 @@
|
||||
@@ -110,11 +110,11 @@
|
||||
gem 'kaminari', '~> 1.0'
|
||||
|
||||
# HAML
|
||||
|
|
@ -153,8 +151,17 @@ gitlab Gemfile
|
|||
+gem 'mini_magick', '~> 4.10', '>= 4.10.1'
|
||||
|
||||
# for backups
|
||||
gem 'fog-aws', '~> 3.8'
|
||||
@@ -132,37 +132,37 @@
|
||||
gem 'fog-aws', '~> 3.9'
|
||||
@@ -126,7 +126,7 @@
|
||||
gem 'fog-openstack', '~> 1.0'
|
||||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
gem 'fog-aliyun', '~> 0.3'
|
||||
-gem 'gitlab-fog-azure-rm', '~> 1.0.1', require: false
|
||||
+gem 'gitlab-fog-azure-rm', '~> 1.0', '>= 1.0.1', require: false
|
||||
|
||||
# for Google storage
|
||||
gem 'google-api-client', '~> 0.33'
|
||||
@@ -135,37 +135,37 @@
|
||||
gem 'unf', '~> 0.1.4'
|
||||
|
||||
# Seed data
|
||||
|
|
@ -205,7 +212,7 @@ gitlab Gemfile
|
|||
gem 'escape_utils', '~> 1.1'
|
||||
|
||||
# Calendar rendering
|
||||
@@ -173,7 +173,7 @@
|
||||
@@ -176,7 +176,7 @@
|
||||
gem 'diff_match_patch', '~> 0.1.0'
|
||||
|
||||
# Application server
|
||||
|
|
@ -214,7 +221,7 @@ gitlab Gemfile
|
|||
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
|
||||
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
|
||||
|
||||
@@ -183,7 +183,7 @@
|
||||
@@ -186,7 +186,7 @@
|
||||
end
|
||||
|
||||
group :puma do
|
||||
|
|
@ -223,7 +230,7 @@ gitlab Gemfile
|
|||
gem 'puma_worker_killer', '~> 0.3.1', require: false
|
||||
end
|
||||
|
||||
@@ -194,13 +194,13 @@
|
||||
@@ -197,13 +197,13 @@
|
||||
gem 'acts-as-taggable-on', '~> 7.0'
|
||||
|
||||
# Background jobs
|
||||
|
|
@ -232,7 +239,7 @@ gitlab Gemfile
|
|||
gem 'sidekiq-cron', '~> 1.0'
|
||||
-gem 'redis-namespace', '~> 1.7.0'
|
||||
+gem 'redis-namespace', '~> 1.7'
|
||||
gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'
|
||||
gem 'gitlab-sidekiq-fetcher', '0.5.5', require: 'sidekiq-reliable-fetch'
|
||||
|
||||
# Cron Parser
|
||||
-gem 'fugit', '~> 1.2.1'
|
||||
|
|
@ -240,7 +247,7 @@ gitlab Gemfile
|
|||
|
||||
# HTTP requests
|
||||
gem 'httparty', '~> 0.16.4'
|
||||
@@ -212,14 +212,14 @@
|
||||
@@ -215,14 +215,14 @@
|
||||
gem 'ruby-progressbar', '~> 1.10'
|
||||
|
||||
# GitLab settings
|
||||
|
|
@ -258,7 +265,7 @@ gitlab Gemfile
|
|||
|
||||
# Export Ruby Regex to Javascript
|
||||
gem 'js_regex', '~> 3.4'
|
||||
@@ -232,20 +232,20 @@
|
||||
@@ -235,20 +235,20 @@
|
||||
gem 'connection_pool', '~> 2.0'
|
||||
|
||||
# Redis session store
|
||||
|
|
@ -266,7 +273,7 @@ gitlab Gemfile
|
|||
+gem 'redis-rails', '~> 5.0', '>= 5.0.2'
|
||||
|
||||
# Discord integration
|
||||
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
|
||||
gem 'discordrb-webhooks', '~> 3.4', require: false
|
||||
|
||||
# Jira integration
|
||||
-gem 'jira-ruby', '~> 2.1.4'
|
||||
|
|
@ -282,7 +289,7 @@ gitlab Gemfile
|
|||
|
||||
# Hangouts Chat integration
|
||||
gem 'hangouts-chat', '~> 0.0.5'
|
||||
@@ -257,11 +257,11 @@
|
||||
@@ -260,17 +260,17 @@
|
||||
gem 'ruby-fogbugz', '~> 0.2.1'
|
||||
|
||||
# Kubernetes integration
|
||||
|
|
@ -297,7 +304,14 @@ gitlab Gemfile
|
|||
|
||||
# Sanitizes SVG input
|
||||
gem 'loofah', '~> 2.2'
|
||||
@@ -287,9 +287,9 @@
|
||||
|
||||
# Working with license
|
||||
-gem 'licensee', '~> 9.14.1'
|
||||
+gem 'licensee', '~> 9.14', '>= 9.14.1'
|
||||
|
||||
# Detect and convert string character encoding
|
||||
gem 'charlock_holmes', '~> 0.7.7'
|
||||
@@ -290,9 +290,9 @@
|
||||
|
||||
gem 'rack-proxy', '~> 0.6.0'
|
||||
|
||||
|
|
@ -310,7 +324,7 @@ gitlab Gemfile
|
|||
|
||||
gem 'addressable', '~> 2.7'
|
||||
gem 'gemojione', '~> 3.3'
|
||||
@@ -300,18 +300,18 @@
|
||||
@@ -303,15 +303,15 @@
|
||||
gem "gitlab-license", "~> 1.3"
|
||||
|
||||
# Protect against bruteforcing
|
||||
|
|
@ -328,12 +342,8 @@ gitlab Gemfile
|
|||
+gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
|
||||
|
||||
# LabKit: Tracing and Correlation
|
||||
-gem 'gitlab-labkit', '0.14.0'
|
||||
+gem 'gitlab-labkit', '~> 0.14.0'
|
||||
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
|
||||
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
|
||||
gem 'thrift', '>= 0.14.0'
|
||||
@@ -319,11 +319,11 @@
|
||||
gem 'gitlab-labkit', '~> 0.16.1'
|
||||
@@ -322,11 +322,11 @@
|
||||
# I18n
|
||||
gem 'ruby_parser', '~> 3.15', require: false
|
||||
gem 'rails-i18n', '~> 6.0'
|
||||
|
|
@ -342,12 +352,12 @@ gitlab Gemfile
|
|||
gem 'gettext_i18n_rails_js', '~> 1.3'
|
||||
gem 'gettext', '~> 3.3', require: false, group: :development
|
||||
|
||||
-gem 'batch-loader', '~> 1.4.0'
|
||||
+gem 'batch-loader', '~> 1.4'
|
||||
-gem 'batch-loader', '~> 2.0.1'
|
||||
+gem 'batch-loader', '~> 2.0', '>= 2.0.1'
|
||||
|
||||
# Perf bar
|
||||
gem 'peek', '~> 1.1'
|
||||
@@ -356,39 +356,39 @@
|
||||
@@ -358,38 +358,38 @@
|
||||
end
|
||||
|
||||
group :development, :test do
|
||||
|
|
@ -380,10 +390,9 @@ gitlab Gemfile
|
|||
+ gem 'spring', '~> 2.1'
|
||||
+ gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
|
||||
|
||||
- gem 'gitlab-styles', '~> 6.0.0', require: false
|
||||
+ gem 'gitlab-styles', '~> 6.0', require: false
|
||||
- gem 'gitlab-styles', '~> 6.1.0', require: false
|
||||
+ gem 'gitlab-styles', '~> 6.1', require: false
|
||||
|
||||
gem 'scss_lint', '~> 0.59.0', require: false
|
||||
gem 'haml_lint', '~> 0.36.0', require: false
|
||||
gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
|
||||
|
|
@ -398,7 +407,7 @@ gitlab Gemfile
|
|||
|
||||
gem 'timecop', '~> 0.9.1'
|
||||
|
||||
@@ -410,18 +410,18 @@
|
||||
@@ -416,18 +416,18 @@
|
||||
end
|
||||
|
||||
group :test do
|
||||
|
|
@ -423,7 +432,7 @@ gitlab Gemfile
|
|||
gem 'rails-controller-testing'
|
||||
gem 'concurrent-ruby', '~> 1.1'
|
||||
gem 'test-prof', '~> 0.12.0'
|
||||
@@ -440,7 +440,7 @@
|
||||
@@ -446,7 +446,7 @@
|
||||
gem 'email_reply_trimmer', '~> 0.1'
|
||||
gem 'html2text'
|
||||
|
||||
|
|
@ -432,7 +441,7 @@ gitlab Gemfile
|
|||
gem 'stackprof', '~> 0.2.15', require: false
|
||||
gem 'rbtrace', '~> 0.4', require: false
|
||||
gem 'memory_profiler', '~> 0.9', require: false
|
||||
@@ -454,8 +454,8 @@
|
||||
@@ -460,8 +460,8 @@
|
||||
gem 'health_check', '~> 3.0'
|
||||
|
||||
# System information
|
||||
|
|
@ -443,7 +452,7 @@ gitlab Gemfile
|
|||
|
||||
# NTP client
|
||||
gem 'net-ntp'
|
||||
@@ -471,13 +471,13 @@
|
||||
@@ -477,13 +477,13 @@
|
||||
end
|
||||
|
||||
# Gitaly GRPC protocol definitions
|
||||
|
|
@ -460,7 +469,7 @@ gitlab Gemfile
|
|||
|
||||
# Feature toggles
|
||||
gem 'flipper', '~> 0.17.1'
|
||||
@@ -496,12 +496,12 @@
|
||||
@@ -502,12 +502,12 @@
|
||||
# Countries list
|
||||
gem 'countries', '~> 3.0'
|
||||
|
||||
|
|
@ -475,7 +484,7 @@ gitlab Gemfile
|
|||
|
||||
# Locked as long as quoted-printable encoding issues are not resolved
|
||||
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
|
||||
@@ -515,12 +515,12 @@
|
||||
@@ -521,12 +521,12 @@
|
||||
gem 'valid_email', '~> 0.1'
|
||||
|
||||
# JSON
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -96,7 +96,6 @@
|
||||
@@ -99,7 +99,6 @@
|
||||
# https://gitlab.com/gitlab-org/gitlab/issues/31747
|
||||
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
|
||||
gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'
|
||||
|
|
@ -10,21 +10,20 @@ Bundler will fail when it can't find these locally
|
|||
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
|
||||
|
||||
gem 'hashie'
|
||||
@@ -321,7 +320,6 @@
|
||||
@@ -324,7 +323,6 @@
|
||||
gem 'rails-i18n', '~> 6.0'
|
||||
gem 'gettext_i18n_rails', '~> 1.8'
|
||||
gem 'gettext_i18n_rails_js', '~> 1.3'
|
||||
-gem 'gettext', '~> 3.3', require: false, group: :development
|
||||
|
||||
gem 'batch-loader', '~> 1.4'
|
||||
gem 'batch-loader', '~> 2.0', '>= 2.0.1'
|
||||
|
||||
@@ -341,20 +339,6 @@
|
||||
@@ -344,19 +342,6 @@
|
||||
gem 'raindrops', '~> 0.18'
|
||||
end
|
||||
|
||||
-group :development do
|
||||
- gem 'brakeman', '~> 4.2', require: false
|
||||
- gem 'danger', '~> 8.0.6', require: false
|
||||
- gem 'lefthook', '~> 0.7', require: false
|
||||
-
|
||||
- gem 'letter_opener_web', '~> 1.3.4'
|
||||
|
|
@ -39,21 +38,20 @@ Bundler will fail when it can't find these locally
|
|||
group :development, :test do
|
||||
gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
|
||||
gem 'bullet', '~> 6.1', '>= 6.1.3'
|
||||
@@ -377,12 +361,6 @@
|
||||
@@ -379,11 +364,6 @@
|
||||
gem 'spring', '~> 2.1'
|
||||
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
|
||||
|
||||
- gem 'gitlab-styles', '~> 6.0', require: false
|
||||
- gem 'gitlab-styles', '~> 6.1', require: false
|
||||
-
|
||||
- gem 'scss_lint', '~> 0.59.0', require: false
|
||||
- gem 'haml_lint', '~> 0.36.0', require: false
|
||||
- gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
-
|
||||
gem 'benchmark-ips', '~> 2.3', require: false
|
||||
|
||||
gem 'knapsack', '~> 1.17'
|
||||
@@ -399,16 +377,6 @@
|
||||
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
|
||||
@@ -405,16 +385,6 @@
|
||||
gem 'gitlab-dangerfiles', '~> 0.8.0', 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
|
||||
@@ -339,7 +339,7 @@
|
||||
@@ -342,7 +342,7 @@
|
||||
gem 'raindrops', '~> 0.18'
|
||||
end
|
||||
|
||||
|
|
@ -11,12 +11,17 @@ Make test dependencies conditional so we can enable them when running autopkgtes
|
|||
gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
|
||||
gem 'bullet', '~> 6.1', '>= 6.1.3'
|
||||
gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
|
||||
@@ -375,9 +375,7 @@
|
||||
@@ -378,14 +378,6 @@
|
||||
gem 'parallel', '~> 1.19', require: false
|
||||
|
||||
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
|
||||
-end
|
||||
|
||||
-
|
||||
-group :development, :test, :danger do
|
||||
- gem 'danger-gitlab', '~> 8.0', require: false
|
||||
- gem 'gitlab-dangerfiles', '~> 0.8.0', require: false
|
||||
-end
|
||||
-
|
||||
-group :test do
|
||||
gem 'fuubar', '~> 2.2'
|
||||
gem 'rspec-retry', '~> 0.6.1'
|
||||
|
|
|
|||
2
debian/patches/0340-relax-httparty.patch
vendored
2
debian/patches/0340-relax-httparty.patch
vendored
|
|
@ -2,7 +2,7 @@ Allow newer versions of httparty to satisfy dependency
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -202,7 +202,7 @@
|
||||
@@ -205,7 +205,7 @@
|
||||
gem 'fugit', '~> 1.2', '>= 1.2.1'
|
||||
|
||||
# HTTP requests
|
||||
|
|
|
|||
2
debian/patches/0350-relax-rdoc.patch
vendored
2
debian/patches/0350-relax-rdoc.patch
vendored
|
|
@ -2,7 +2,7 @@ Allow rdoc from ruby 2.5 to match requirement
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -150,7 +150,7 @@
|
||||
@@ -153,7 +153,7 @@
|
||||
gem 'commonmarker', '~> 0.21'
|
||||
gem 'kramdown', '~> 2.3'
|
||||
gem 'RedCloth', '~> 4.3', '>= 4.3.2'
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ maintaining two almost same packages.
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -145,7 +145,6 @@
|
||||
@@ -148,7 +148,6 @@
|
||||
# Markdown and HTML processing
|
||||
gem 'html-pipeline', '~> 2.13', '>= 2.13.2'
|
||||
gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1'
|
||||
|
|
|
|||
2
debian/patches/0440-remove-unicorn.patch
vendored
2
debian/patches/0440-remove-unicorn.patch
vendored
|
|
@ -3,7 +3,7 @@ gitlab-puma changes is included in puma package.
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -175,11 +175,6 @@
|
||||
@@ -178,11 +178,6 @@
|
||||
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
|
||||
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -134,7 +134,7 @@
|
||||
@@ -137,7 +137,7 @@
|
||||
gem 'seed-fu', '~> 2.3', '>= 2.3.7'
|
||||
|
||||
# Search
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -135,7 +135,7 @@
|
||||
@@ -138,7 +138,7 @@
|
||||
|
||||
# Search
|
||||
gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ This gem is used only in gitlab Enterprise Edition
|
|||
# Spam and anti-bot protection
|
||||
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
|
||||
gem 'akismet', '~> 3.0'
|
||||
@@ -290,8 +287,6 @@
|
||||
@@ -293,8 +290,6 @@
|
||||
gem 'request_store', '~> 1.5'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
|
|
|
|||
2
debian/patches/0484-relax-grape-entity.patch
vendored
2
debian/patches/0484-relax-grape-entity.patch
vendored
|
|
@ -2,7 +2,7 @@ Debian already has 0.8
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -83,7 +83,7 @@
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
# API
|
||||
gem 'grape', '~> 1.5', '>= 1.5.2'
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ Allow newer version in the archive to satisfy the requirement
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -187,7 +187,7 @@
|
||||
@@ -190,7 +190,7 @@
|
||||
gem 'sidekiq', '~> 5.2', '>= 5.2.7'
|
||||
gem 'sidekiq-cron', '~> 1.0'
|
||||
gem 'redis-namespace', '~> 1.7'
|
||||
-gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'
|
||||
-gem 'gitlab-sidekiq-fetcher', '0.5.5', require: 'sidekiq-reliable-fetch'
|
||||
+gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch'
|
||||
|
||||
# Cron Parser
|
||||
|
|
|
|||
2
debian/patches/0486-relax-sidekiq.patch
vendored
2
debian/patches/0486-relax-sidekiq.patch
vendored
|
|
@ -2,7 +2,7 @@ ruby-sidekiq 6 is in unstable
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -184,7 +184,7 @@
|
||||
@@ -187,7 +187,7 @@
|
||||
gem 'acts-as-taggable-on', '~> 7.0'
|
||||
|
||||
# Background jobs
|
||||
|
|
|
|||
2
debian/patches/0499-10-relax-capybara.patch
vendored
2
debian/patches/0499-10-relax-capybara.patch
vendored
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -370,7 +370,7 @@
|
||||
@@ -372,7 +372,7 @@
|
||||
gem 'rspec_profiling', '~> 0.0.6'
|
||||
gem 'rspec-parameterized', require: false
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -371,7 +371,6 @@
|
||||
@@ -373,7 +373,6 @@
|
||||
gem 'rspec-parameterized', require: false
|
||||
|
||||
gem 'capybara', '~> 3.12'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -380,7 +380,6 @@
|
||||
@@ -382,7 +382,6 @@
|
||||
gem 'concurrent-ruby', '~> 1.1'
|
||||
gem 'test-prof', '~> 0.12.0'
|
||||
gem 'rspec_junit_formatter'
|
||||
|
|
|
|||
2
debian/patches/0499-40-relax-rouge.patch
vendored
2
debian/patches/0499-40-relax-rouge.patch
vendored
|
|
@ -3,7 +3,7 @@ rouge update is blocked by
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -154,7 +154,7 @@
|
||||
@@ -157,7 +157,7 @@
|
||||
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
|
||||
gem 'asciidoctor-plantuml', '~> 0.0.12'
|
||||
gem 'asciidoctor-kroki', '~> 0.4.0', require: false
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ newer version is in the archive
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -93,7 +93,7 @@
|
||||
@@ -96,7 +96,7 @@
|
||||
# https://gitlab.com/gitlab-org/gitlab/issues/31747
|
||||
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
|
||||
gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'
|
||||
|
|
|
|||
2
debian/patches/0499-90-relax-webrick.patch
vendored
2
debian/patches/0499-90-relax-webrick.patch
vendored
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -321,7 +321,7 @@
|
||||
@@ -324,7 +324,7 @@
|
||||
# Metrics
|
||||
group :metrics do
|
||||
gem 'method_source', '~> 1.0', require: false
|
||||
|
|
|
|||
13
debian/patches/0499-91-relax-gitlab-labkit.patch
vendored
13
debian/patches/0499-91-relax-gitlab-labkit.patch
vendored
|
|
@ -1,13 +0,0 @@
|
|||
gitaly needs gitlab-labkit ~> 0.15.0
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -299,7 +299,7 @@
|
||||
gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
|
||||
|
||||
# LabKit: Tracing and Correlation
|
||||
-gem 'gitlab-labkit', '~> 0.14.0'
|
||||
+gem 'gitlab-labkit', '~> 0.15.0'
|
||||
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
|
||||
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
|
||||
gem 'thrift', '>= 0.14.0'
|
||||
6
debian/patches/0500-set-webpack-root.patch
vendored
6
debian/patches/0500-set-webpack-root.patch
vendored
|
|
@ -2,9 +2,9 @@ Debian specific patch to help webpack find sources
|
|||
|
||||
--- a/config/webpack.config.js
|
||||
+++ b/config/webpack.config.js
|
||||
@@ -11,7 +11,7 @@
|
||||
const vendorDllHash = require('./helpers/vendor_dll_hash');
|
||||
const createIncrementalWebpackCompiler = require('./helpers/incremental_webpack_compiler');
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
const MonacoWebpackPlugin = require('./plugins/monaco_webpack');
|
||||
|
||||
-const ROOT_PATH = path.resolve(__dirname, '..');
|
||||
+const ROOT_PATH = '/usr/share/gitlab';
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@ These are not required in production
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -154,69 +154,7 @@
|
||||
@@ -169,66 +169,6 @@
|
||||
"xterm": "3.14.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
- "@babel/plugin-transform-modules-commonjs": "^7.10.1",
|
||||
- "@gitlab/eslint-plugin": "8.0.0",
|
||||
- "@gitlab/eslint-plugin": "8.1.0",
|
||||
- "@gitlab/stylelint-config": "2.3.0",
|
||||
- "@testing-library/dom": "^7.16.2",
|
||||
- "@vue/test-utils": "1.1.2",
|
||||
- "acorn": "^6.3.0",
|
||||
|
|
@ -19,17 +20,17 @@ These are not required in production
|
|||
- "commander": "^2.18.0",
|
||||
- "custom-jquery-matchers": "^2.1.0",
|
||||
- "docdash": "^1.0.2",
|
||||
- "eslint": "7.19.0",
|
||||
- "eslint": "7.21.0",
|
||||
- "eslint-import-resolver-jest": "3.0.0",
|
||||
- "eslint-import-resolver-webpack": "0.13.0",
|
||||
- "eslint-plugin-jasmine": "4.1.2",
|
||||
- "eslint-plugin-no-jquery": "2.5.0",
|
||||
- "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",
|
||||
- "glob": "^7.1.6",
|
||||
- "jasmine-core": "^2.9.0",
|
||||
- "jasmine-diff": "^0.1.3",
|
||||
- "jasmine-jquery": "^2.1.1",
|
||||
|
|
@ -59,17 +60,12 @@ These are not required in production
|
|||
- "postcss": "^7.0.14",
|
||||
- "prettier": "2.2.1",
|
||||
- "readdir-enhanced": "^2.2.4",
|
||||
- "stylelint": "^10.1.0",
|
||||
- "stylelint-config-recommended": "^2.2.0",
|
||||
- "stylelint-scss": "^3.9.2",
|
||||
- "timezone-mock": "^1.0.8",
|
||||
- "vue-jest": "4.0.0-rc.0",
|
||||
- "vue-jest": "4.0.1",
|
||||
- "webpack-dev-server": "^3.11.2",
|
||||
- "xhr-mock": "^2.5.1",
|
||||
- "yarn-check-webpack-plugin": "^1.2.0",
|
||||
- "yarn-deduplicate": "^1.1.1"
|
||||
- },
|
||||
+ },
|
||||
},
|
||||
"blockedDependencies": {
|
||||
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Debian specific patch to allow webpack to resolve packaged node modules
|
|||
|
||||
--- a/config/webpack.config.js
|
||||
+++ b/config/webpack.config.js
|
||||
@@ -185,9 +185,14 @@
|
||||
@@ -188,9 +188,14 @@
|
||||
|
||||
resolve: {
|
||||
extensions: ['.js', '.gql', '.graphql'],
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
typescript 4.2 breaks yarn 2 pnp compat plugin
|
||||
|
||||
Bug: https://github.com/yarnpkg/berry/pull/2440
|
||||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -160,7 +160,8 @@
|
||||
},
|
||||
"resolutions": {
|
||||
"chokidar": "^3.4.0",
|
||||
- "monaco-editor": "0.20.0"
|
||||
+ "monaco-editor": "0.20.0",
|
||||
+ "typescript": "4.1.5"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.13.0",
|
||||
54
debian/patches/0740-use-packaged-modules.patch
vendored
54
debian/patches/0740-use-packaged-modules.patch
vendored
|
|
@ -20,15 +20,15 @@ Use debian packaged node modules when available
|
|||
|
||||
--- a/config/webpack.config.js
|
||||
+++ b/config/webpack.config.js
|
||||
@@ -6,7 +6,6 @@
|
||||
const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
|
||||
const CompressionPlugin = require('compression-webpack-plugin');
|
||||
const MonacoWebpackPlugin = require('./plugins/monaco_webpack');
|
||||
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
|
||||
const CopyWebpackPlugin = require('copy-webpack-plugin');
|
||||
const vendorDllHash = require('./helpers/vendor_dll_hash');
|
||||
const createIncrementalWebpackCompiler = require('./helpers/incremental_webpack_compiler');
|
||||
@@ -175,6 +174,8 @@
|
||||
@@ -10,7 +10,6 @@
|
||||
const VUE_LOADER_VERSION = require('vue-loader/package.json').version;
|
||||
const VUE_VERSION = require('vue/package.json').version;
|
||||
const webpack = require('webpack');
|
||||
-const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
|
||||
const { StatsWriterPlugin } = require('webpack-stats-plugin');
|
||||
const WEBPACK_VERSION = require('webpack/package.json').version;
|
||||
|
||||
@@ -178,6 +177,8 @@
|
||||
|
||||
entry: generateEntries,
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ Use debian packaged node modules when available
|
|||
output: {
|
||||
path: WEBPACK_OUTPUT_PATH,
|
||||
publicPath: WEBPACK_PUBLIC_PATH,
|
||||
@@ -184,13 +185,13 @@
|
||||
@@ -187,13 +188,13 @@
|
||||
},
|
||||
|
||||
resolve: {
|
||||
|
|
@ -54,14 +54,14 @@ Use debian packaged node modules when available
|
|||
},
|
||||
|
||||
module: {
|
||||
@@ -203,9 +204,13 @@
|
||||
@@ -206,9 +207,13 @@
|
||||
},
|
||||
{
|
||||
test: /\.js$/,
|
||||
- exclude: (path) =>
|
||||
+ exclude: [ (path) =>
|
||||
/node_modules\/(?!tributejs)|node_modules|vendor[\\/]assets/.test(path) &&
|
||||
!/\.vue\.js/.test(path),
|
||||
- exclude: (modulePath) =>
|
||||
+ exclude: [(modulePath) =>
|
||||
/node_modules\/(?!tributejs)|node_modules|vendor[\\/]assets/.test(modulePath) &&
|
||||
!/\.vue\.js/.test(modulePath),
|
||||
+ /\/usr\/share\/nodejs/,
|
||||
+ /\/usr\/lib\/nodejs/,
|
||||
+ /\/usr\/share\/javascript/
|
||||
|
|
@ -69,7 +69,7 @@ Use debian packaged node modules when available
|
|||
loader: 'babel-loader',
|
||||
options: {
|
||||
cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
|
||||
@@ -282,7 +287,7 @@
|
||||
@@ -285,7 +290,7 @@
|
||||
},
|
||||
{
|
||||
test: /\.(eot|ttf|woff|woff2)$/,
|
||||
|
|
@ -78,7 +78,7 @@ Use debian packaged node modules when available
|
|||
loader: 'file-loader',
|
||||
options: {
|
||||
name: '[name].[contenthash:8].[ext]',
|
||||
@@ -565,19 +570,6 @@
|
||||
@@ -572,19 +577,6 @@
|
||||
// enable HMR only in webpack-dev-server
|
||||
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ Use debian packaged node modules when available
|
|||
new webpack.DefinePlugin({
|
||||
// This one is used to define window.gon.ee and other things properly in tests:
|
||||
'process.env.IS_EE': JSON.stringify(IS_EE),
|
||||
@@ -614,6 +606,7 @@
|
||||
@@ -621,6 +613,7 @@
|
||||
|
||||
node: {
|
||||
fs: 'empty', // sqljs requires fs
|
||||
|
|
@ -108,7 +108,7 @@ Use debian packaged node modules when available
|
|||
};
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -98,26 +98,26 @@
|
||||
@@ -113,26 +113,26 @@
|
||||
"jquery": "^3.5.0",
|
||||
"jquery.caret": "^0.3.1",
|
||||
"jquery.waitforimages": "^2.2.0",
|
||||
|
|
@ -139,25 +139,25 @@ Use debian packaged node modules when available
|
|||
- "popper.js": "^1.16.1",
|
||||
+ "popper.js": "link:/usr/share/nodejs/popper.js",
|
||||
"prismjs": "^1.21.0",
|
||||
- "prosemirror-markdown": "^1.3.0",
|
||||
- "prosemirror-model": "^1.6.4",
|
||||
- "prosemirror-markdown": "^1.5.1",
|
||||
- "prosemirror-model": "^1.13.3",
|
||||
+ "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
|
||||
+ "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
|
||||
"raphael": "^2.2.7",
|
||||
"raw-loader": "^4.0.2",
|
||||
"select2": "3.5.2-browserify",
|
||||
@@ -128,26 +128,25 @@
|
||||
@@ -143,26 +143,25 @@
|
||||
"style-loader": "^1.3.0",
|
||||
"swagger-ui-dist": "^3.43.0",
|
||||
"swagger-ui-dist": "^3.44.1",
|
||||
"three": "^0.84.0",
|
||||
- "three-orbit-controls": "^82.1.0",
|
||||
+ "three-orbit-controls": "link:/usr/share/nodejs/three-orbit-controls",
|
||||
"three-stl-loader": "^1.0.4",
|
||||
- "timeago.js": "^4.0.2",
|
||||
+ "timeago.js": "link:/usr/share/nodejs/timeago.js",
|
||||
"tiptap": "^1.8.0",
|
||||
"tiptap-commands": "^1.4.0",
|
||||
"tiptap-extensions": "^1.8.0",
|
||||
"tiptap": "^1.32.1",
|
||||
"tiptap-commands": "^1.17.1",
|
||||
"tiptap-extensions": "^1.35.1",
|
||||
"url-loader": "^3.0.0",
|
||||
- "uuid": "8.1.0",
|
||||
+ "uuid": "link:/usr/share/nodejs/uuid",
|
||||
|
|
@ -180,7 +180,7 @@ Use debian packaged node modules when available
|
|||
"worker-loader": "^2.0.0",
|
||||
--- a/babel.config.js
|
||||
+++ b/babel.config.js
|
||||
@@ -16,9 +16,12 @@
|
||||
@@ -14,9 +14,12 @@
|
||||
// include stage 3 proposals
|
||||
const plugins = [
|
||||
'@babel/plugin-syntax-import-meta',
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
require 'selenium-webdriver'
|
||||
|
||||
# Give CI some extra time
|
||||
@@ -86,18 +85,6 @@
|
||||
@@ -108,18 +107,6 @@
|
||||
Capybara.default_normalize_ws = true
|
||||
Capybara.enable_aria_label = true
|
||||
|
||||
|
|
|
|||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
|
|
@ -17,11 +17,9 @@
|
|||
0499-40-relax-rouge.patch
|
||||
0499-70-relax-graphlient.patch
|
||||
0499-90-relax-webrick.patch
|
||||
0499-91-relax-gitlab-labkit.patch
|
||||
0500-set-webpack-root.patch
|
||||
0510-remove-dev-dependencies.patch
|
||||
0520-add-system-lib-path-for-webpack.patch
|
||||
0530-typescript-yarnpkg-comapt.patch
|
||||
0610-source-init-functions.patch
|
||||
0620-pid-log-paths.patch
|
||||
0630-fix-mail-room-path.patch
|
||||
|
|
|
|||
Loading…
Reference in a new issue