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:
Sruthi Chandran 2021-10-01 04:34:20 +05:30
parent b02a0bcf00
commit 1acbae39b8
17 changed files with 126 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
debian/patches/0050-relax-stable-libs.patch vendored
View file

@ -11,7 +11,7 @@ gitlab Gemfile
+gem 'rails', '~> 6.1.3','>= 6.1.3.2' +gem 'rails', '~> 6.1.3','>= 6.1.3.2'
-gem 'bootsnap', '~> 1.4.6' -gem 'bootsnap', '~> 1.4.6'
+gem 'bootsnap', '~> 1.4','>= 1.4.6' +gem 'bootsnap', '~> 1.4'
# Responders respond_to and respond_with # Responders respond_to and respond_with
gem 'responders', '~> 3.0' gem 'responders', '~> 3.0'
@ -53,7 +53,7 @@ gitlab Gemfile
gem 'omniauth', '~> 1.8' gem 'omniauth', '~> 1.8'
-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', '~> 0.1' gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
-gem 'omniauth-cas3', '~> 1.1.4' -gem 'omniauth-cas3', '~> 1.1.4'
-gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-facebook', '~> 4.0.0'
@ -151,7 +151,7 @@ gitlab Gemfile
# Files attachments # Files attachments
gem 'carrierwave', '~> 1.3' gem 'carrierwave', '~> 1.3'
-gem 'mini_magick', '~> 4.10.1' -gem 'mini_magick', '~> 4.10.1'
+gem 'mini_magick', '~> 4.10', '>= 4.10.1' +gem 'mini_magick', '~> 4.10','>= 4.10.1'
# for backups # for backups
gem 'fog-aws', '~> 3.9' gem 'fog-aws', '~> 3.9'
@ -159,7 +159,7 @@ gitlab Gemfile
# Also see config/initializers/fog_core_patch.rb. # Also see config/initializers/fog_core_patch.rb.
-gem 'fog-core', '= 2.1.0' -gem 'fog-core', '= 2.1.0'
+gem 'fog-core', '= 2.1' +gem 'fog-core', '= 2.1'
gem 'gitlab-fog-google', '~> 1.13', require: 'fog/google' gem 'fog-google', '~> 1.15', require: 'fog/google'
gem 'fog-local', '~> 0.6' gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0' gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1' gem 'fog-rackspace', '~> 0.1.1'
@ -174,13 +174,13 @@ gitlab Gemfile
# Seed data # Seed data
-gem 'seed-fu', '~> 2.3.7' -gem 'seed-fu', '~> 2.3.7'
+gem 'seed-fu', '~> 2.3', '>= 2.3.7' +gem 'seed-fu', '~> 2.3','>= 2.3.7'
# Search # Search
gem 'elasticsearch-model', '~> 6.1' gem 'elasticsearch-model', '~> 6.1'
gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
-gem 'elasticsearch-api', '~> 6.8.2' -gem 'elasticsearch-api', '~> 6.8.2'
+gem 'elasticsearch-api', '~> 6.8', '>= 6.8.2' +gem 'elasticsearch-api', '~> 6.8','>= 6.8.2'
gem 'aws-sdk-core', '~> 3' gem 'aws-sdk-core', '~> 3'
gem 'aws-sdk-cloudformation', '~> 1' gem 'aws-sdk-cloudformation', '~> 1'
gem 'aws-sdk-s3', '~> 1' gem 'aws-sdk-s3', '~> 1'
@ -191,25 +191,25 @@ gitlab Gemfile
-gem 'deckar01-task_list', '2.3.1' -gem 'deckar01-task_list', '2.3.1'
-gem 'gitlab-markup', '~> 1.7.1' -gem 'gitlab-markup', '~> 1.7.1'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'html-pipeline', '~> 2.13', '>= 2.13.2' +gem 'html-pipeline', '~> 2.13','>= 2.13.2'
+gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1' +gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'
+gem 'gitlab-markup', '~> 1.7', '>= 1.7.1' +gem 'gitlab-markup', '~> 1.7','>= 1.7.1'
+gem 'github-markup', '~> 1.7', require: 'github/markup' +gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.21' gem 'commonmarker', '~> 0.21'
-gem 'kramdown', '~> 2.3.1' -gem 'kramdown', '~> 2.3.1'
-gem 'RedCloth', '~> 4.3.2' -gem 'RedCloth', '~> 4.3.2'
-gem 'gitlab-rdoc', '~> 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695 -gem 'rdoc', '~> 6.3.2'
+gem 'kramdown', '~> 2.3','>= 2.3.1' +gem 'kramdown', '~> 2.3','>= 2.3.1'
+gem 'RedCloth', '~> 4.3', '>= 4.3.2' +gem 'RedCloth', '~> 4.3','>= 4.3.2'
+gem 'gitlab-rdoc', '~> 6.3', '>= 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695 +gem 'rdoc', '~> 6.3','>= 6.3.2'
gem 'org-ruby', '~> 0.9.12' gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0' gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1' gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 2.0.10' -gem 'asciidoctor', '~> 2.0.10'
+gem 'asciidoctor', '~> 2.0', '>= 2.0.10' +gem 'asciidoctor', '~> 2.0','>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-plantuml', '~> 0.0.12'
gem 'asciidoctor-kroki', '~> 0.4.0', require: false gem 'asciidoctor-kroki', '~> 0.5.0', require: false
-gem 'rouge', '~> 3.26.0' -gem 'rouge', '~> 3.26.0'
+gem 'rouge', '~> 3.26' +gem 'rouge', '~> 3.26'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
@ -240,15 +240,15 @@ gitlab Gemfile
# Background jobs # Background jobs
-gem 'sidekiq', '~> 5.2.7' -gem 'sidekiq', '~> 5.2.7'
+gem 'sidekiq', '~> 5.2', '>= 5.2.7' +gem 'sidekiq', '~> 5.2','>= 5.2.7'
gem 'sidekiq-cron', '~> 1.0' gem 'sidekiq-cron', '~> 1.0'
-gem 'redis-namespace', '~> 1.7.0' -gem 'redis-namespace', '~> 1.8.1'
+gem 'redis-namespace', '~> 1.7' +gem 'redis-namespace', '~> 1.8','>= 1.8.1'
gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch' gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch'
# Cron Parser # Cron Parser
-gem 'fugit', '~> 1.2.1' -gem 'fugit', '~> 1.2.1'
+gem 'fugit', '~> 1.2', '>= 1.2.1' +gem 'fugit', '~> 1.2','>= 1.2.1'
# HTTP requests # HTTP requests
gem 'httparty', '~> 0.16.4' gem 'httparty', '~> 0.16.4'
@ -270,7 +270,12 @@ gitlab Gemfile
# Export Ruby Regex to Javascript # Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.4' gem 'js_regex', '~> 3.4'
@@ -233,20 +233,20 @@ @@ -229,24 +229,24 @@
gem 'device_detector'
# Redis
-gem 'redis', '~> 4.1.4'
+gem 'redis', '~> 4.1','>= 4.1.4'
gem 'connection_pool', '~> 2.0' gem 'connection_pool', '~> 2.0'
# Redis session store # Redis session store
@ -298,21 +303,21 @@ gitlab Gemfile
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration # Kubernetes integration
-gem 'kubeclient', '~> 4.9.1' -gem 'kubeclient', '~> 4.9.2'
+gem 'kubeclient', '~> 4.9', '>= 4.9.1' +gem 'kubeclient', '~> 4.9','>= 4.9.2'
# Sanitize user input # Sanitize user input
-gem 'sanitize', '~> 5.2.1' -gem 'sanitize', '~> 5.2.1'
-gem 'babosa', '~> 1.0.4' -gem 'babosa', '~> 1.0.4'
+gem 'sanitize', '~> 5.2', '>= 5.2.1' +gem 'sanitize', '~> 5.2','>= 5.2.1'
+gem 'babosa', '~> 1.0', '>= 1.0.2' +gem 'babosa', '~> 1.0','>= 1.0.4'
# Sanitizes SVG input # Sanitizes SVG input
gem 'loofah', '~> 2.2' gem 'loofah', '~> 2.2'
# Working with license # Working with license
-gem 'licensee', '~> 9.14.1' -gem 'licensee', '~> 9.14.1'
+gem 'licensee', '~> 9.14', '>= 9.14.1' +gem 'licensee', '~> 9.14','>= 9.14.1'
# Detect and convert string character encoding # Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7' gem 'charlock_holmes', '~> 0.7.7'
@ -321,20 +326,20 @@ gitlab Gemfile
gem 'rack-proxy', '~> 0.6.0' gem 'rack-proxy', '~> 0.6.0'
-gem 'sassc-rails', '~> 2.1.0' -gem 'sassc-rails', '~> 2.1.0'
-gem 'autoprefixer-rails', '10.2.0.0' -gem 'autoprefixer-rails', '10.2.5.1'
-gem 'terser', '1.0.2' -gem 'terser', '1.0.2'
+gem 'sassc-rails', '~> 2.1' +gem 'sassc-rails', '~> 2.1'
+gem 'autoprefixer-rails', '10.2' +gem 'autoprefixer-rails', '~> 10.2','>= 10.2.5.1'
+gem 'terser', '~> 1.0','>= 1.0.2' +gem 'terser', '~> 1.0','>= 1.0.2'
gem 'addressable', '~> 2.7' gem 'addressable', '~> 2.8'
gem 'gemojione', '~> 3.3' gem 'gemojione', '~> 3.3'
-gem 'gon', '~> 6.4.0' -gem 'gon', '~> 6.4.0'
+gem 'gon', '~> 6.4' +gem 'gon', '~> 6.4'
gem 'request_store', '~> 1.5' gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'
gem 'gitlab-license', '~> 1.5' gem 'gitlab-license', '~> 2.0'
# Protect against bruteforcing # Protect against bruteforcing
-gem 'rack-attack', '~> 6.3.0' -gem 'rack-attack', '~> 6.3.0'
@ -342,19 +347,16 @@ gitlab Gemfile
# Sentry integration # Sentry integration
gem 'sentry-raven', '~> 3.1' gem 'sentry-raven', '~> 3.1'
@@ -309,9 +309,9 @@ @@ -307,7 +307,7 @@
# and https://github.com/pganalyze/pg_query/pull/213 are #
# released. gitlab-labkit will need to be updated to use the pg_query gem 'pg_query', '~> 2.1'
# version.
-gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query'
+gem 'gitlab-pg_query', '~> 2.0','>= 2.0.4', require: 'pg_query'
-gem 'premailer-rails', '~> 1.10.3' -gem 'premailer-rails', '~> 1.10.3'
+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.18.0' gem 'gitlab-labkit', '~> 0.20.0'
@@ -322,11 +322,11 @@ @@ -318,11 +318,11 @@
# I18n # I18n
gem 'ruby_parser', '~> 3.15', require: false gem 'ruby_parser', '~> 3.15', require: false
gem 'rails-i18n', '~> 6.0' gem 'rails-i18n', '~> 6.0'
@ -368,7 +370,16 @@ gitlab Gemfile
# Perf bar # Perf bar
gem 'peek', '~> 1.1' gem 'peek', '~> 1.1'
@@ -357,38 +357,38 @@ @@ -332,7 +332,7 @@
# Metrics
gem 'method_source', '~> 1.0', require: false
-gem 'webrick', '~> 1.6.1', require: false
+gem 'webrick', '~> 1.6','>= 1.6.1', require: false
gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
group :development do
@@ -349,38 +349,38 @@
end end
group :development, :test do group :development, :test do
@ -419,7 +430,7 @@ gitlab Gemfile
gem 'timecop', '~> 0.9.1' gem 'timecop', '~> 0.9.1'
@@ -416,18 +416,18 @@ @@ -408,18 +408,18 @@
end end
group :test do group :test do
@ -431,20 +442,22 @@ gitlab Gemfile
- gem 'capybara', '~> 3.35.3' - gem 'capybara', '~> 3.35.3'
- gem 'capybara-screenshot', '~> 1.0.22' - gem 'capybara-screenshot', '~> 1.0.22'
+ gem 'capybara', '~> 3.35', '~> 3.35.3' - gem 'selenium-webdriver', '~> 3.142'
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22' -
gem 'selenium-webdriver', '~> 3.142'
- gem 'shoulda-matchers', '~> 4.0.1', require: false - gem 'shoulda-matchers', '~> 4.0.1', require: false
- gem 'email_spec', '~> 2.2.0' - gem 'email_spec', '~> 2.2.0'
- gem 'webmock', '~> 3.9.1' - gem 'webmock', '~> 3.9.1'
+ gem 'capybara', '~> 3.35', '~> 3.35.3'
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
+ gem 'selenium-webdriver', '~> 3.1','>= 3.142'
+
+ gem 'shoulda-matchers', '~> 4.0', '>= 4.0.1', require: false + gem 'shoulda-matchers', '~> 4.0', '>= 4.0.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'
gem 'rails-controller-testing' gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1' gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0' gem 'test-prof', '~> 0.12.0'
@@ -446,7 +446,7 @@ @@ -438,7 +438,7 @@
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
@ -453,7 +466,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
@@ -460,8 +460,8 @@ @@ -452,8 +452,8 @@
gem 'health_check', '~> 3.0' gem 'health_check', '~> 3.0'
# System information # System information
@ -464,12 +477,12 @@ gitlab Gemfile
# NTP client # NTP client
gem 'net-ntp' gem 'net-ntp'
@@ -480,16 +480,16 @@ @@ -472,14 +472,14 @@
gem 'spamcheck', '~> 0.1.0' gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 14.0.0.pre.rc2' -gem 'gitaly', '~> 14.1.0.pre.rc3'
+gem 'gitaly', '~> 14.0' +gem 'gitaly', '~> 14.1'
# KAS GRPC protocol definitions # KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2' gem 'kas-grpc', '~> 0.0.2'
@ -480,12 +493,9 @@ gitlab Gemfile
-gem 'google-protobuf', '~> 3.17.1' -gem 'google-protobuf', '~> 3.17.1'
+gem 'google-protobuf', '~> 3.17','>= 3.17.1' +gem 'google-protobuf', '~> 3.17','>= 3.17.1'
-gem 'toml-rb', '~> 1.0.0' gem 'toml-rb', '~> 2.0'
+gem 'toml-rb', '~> 1.0'
# Feature toggles @@ -500,12 +500,12 @@
gem 'flipper', '~> 0.21.0'
@@ -508,12 +508,12 @@
# Countries list # Countries list
gem 'countries', '~> 3.0' gem 'countries', '~> 3.0'
@ -500,7 +510,7 @@ 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`
@@ -528,11 +528,11 @@ @@ -520,11 +520,11 @@
gem 'valid_email', '~> 0.1' gem 'valid_email', '~> 0.1'
# JSON # JSON

14
debian/patches/0100-remove-development-test.patch vendored
View file

@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
gem 'hashie' gem 'hashie'
@@ -324,7 +323,6 @@ @@ -320,7 +319,6 @@
gem 'rails-i18n', '~> 6.0' gem 'rails-i18n', '~> 6.0'
gem 'gettext_i18n_rails', '~> 1.8' gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext_i18n_rails_js', '~> 1.3'
@ -18,9 +18,9 @@ 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'
@@ -343,19 +341,6 @@ @@ -335,19 +333,6 @@
gem 'prometheus-client-mmap', '~> 0.12.0' gem 'webrick', '~> 1.6','>= 1.6.1', require: false
end gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
-group :development do -group :development do
- gem 'lefthook', '~> 0.7.0', require: false - gem 'lefthook', '~> 0.7.0', require: false
@ -38,7 +38,7 @@ Bundler will fail when it can't find these locally
group :development, :test do group :development, :test do
gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
gem 'bullet', '~> 6.1', '>= 6.1.3' gem 'bullet', '~> 6.1', '>= 6.1.3'
@@ -378,11 +363,6 @@ @@ -370,11 +355,6 @@
gem 'spring', '~> 2.1' gem 'spring', '~> 2.1'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4' gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
@ -50,12 +50,12 @@ Bundler will fail when it can't find these locally
gem 'benchmark-ips', '~> 2.3', require: false gem 'benchmark-ips', '~> 2.3', require: false
gem 'knapsack', '~> 1.21', '>= 1.21.1' gem 'knapsack', '~> 1.21', '>= 1.21.1'
@@ -401,20 +381,6 @@ @@ -393,20 +373,6 @@
gem 'test_file_finder', '~> 0.1.3' gem 'test_file_finder', '~> 0.1.3'
end end
-group :development, :test, :danger do -group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 2.1.2', require: false - gem 'gitlab-dangerfiles', '~> 2.2.2', require: false
-end -end
- -
-group :development, :test, :coverage do -group :development, :test, :coverage do

8
debian/patches/0110-make-test-dependencies-conditional.patch vendored
View file

@ -2,16 +2,16 @@ Make test dependencies conditional so we can enable them when running autopkgtes
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -341,7 +341,7 @@ @@ -333,7 +333,7 @@
gem 'prometheus-client-mmap', '~> 0.12.0' gem 'webrick', '~> 1.6','>= 1.6.1', require: false
end gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
-group :development, :test do -group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true" +if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
gem 'bullet', '~> 6.1', '>= 6.1.3' gem 'bullet', '~> 6.1', '>= 6.1.3'
gem 'pry-byebug' gem 'pry-byebug'
@@ -379,9 +379,7 @@ @@ -371,9 +371,7 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
gem 'test_file_finder', '~> 0.1.3' gem 'test_file_finder', '~> 0.1.3'

2
debian/patches/0340-relax-httparty.patch vendored
View file

@ -3,7 +3,7 @@ Allow newer versions of httparty to satisfy dependency
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -203,7 +203,7 @@ @@ -203,7 +203,7 @@
gem 'fugit', '~> 1.2', '>= 1.2.1' gem 'fugit', '~> 1.2','>= 1.2.1'
# HTTP requests # HTTP requests
-gem 'httparty', '~> 0.16.4' -gem 'httparty', '~> 0.16.4'

6
debian/patches/0350-relax-rdoc.patch vendored
View file

@ -5,9 +5,9 @@ Allow rdoc from ruby 2.5 to match requirement
@@ -156,7 +156,7 @@ @@ -156,7 +156,7 @@
gem 'commonmarker', '~> 0.21' gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3','>= 2.3.1' gem 'kramdown', '~> 2.3','>= 2.3.1'
gem 'RedCloth', '~> 4.3', '>= 4.3.2' gem 'RedCloth', '~> 4.3','>= 4.3.2'
-gem 'gitlab-rdoc', '~> 6.3', '>= 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695 -gem 'rdoc', '~> 6.3','>= 6.3.2'
+gem 'rdoc', '~> 6.0', require: 'rdoc' # See https://gitlab.com/gitlab-org/gitlab/-/issues/334695 +gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12' gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0' gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1' gem 'wikicloth', '0.8.1'

6
debian/patches/0430-remove-gitlab-markup.patch vendored
View file

@ -6,9 +6,9 @@ maintaining two almost same packages.
+++ b/Gemfile +++ b/Gemfile
@@ -151,7 +151,6 @@ @@ -151,7 +151,6 @@
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.13', '>= 2.13.2' gem 'html-pipeline', '~> 2.13','>= 2.13.2'
gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1' gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'
-gem 'gitlab-markup', '~> 1.7', '>= 1.7.1' -gem 'gitlab-markup', '~> 1.7','>= 1.7.1'
gem 'github-markup', '~> 1.7', require: 'github/markup' gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.21' gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3','>= 2.3.1' gem 'kramdown', '~> 2.3','>= 2.3.1'

4
debian/patches/0480-embed-elasticsearch-model.patch vendored
View file

@ -3,11 +3,11 @@ Embed this gem until gitlab moved to 7.x version
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
gem 'seed-fu', '~> 2.3', '>= 2.3.7' gem 'seed-fu', '~> 2.3','>= 2.3.7'
# Search # Search
-gem 'elasticsearch-model', '~> 6.1' -gem 'elasticsearch-model', '~> 6.1'
+gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model' +gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '~> 6.8', '>= 6.8.2' gem 'elasticsearch-api', '~> 6.8','>= 6.8.2'
gem 'aws-sdk-core', '~> 3' gem 'aws-sdk-core', '~> 3'

2
debian/patches/0480-embed-elasticsearch-rails.patch vendored
View file

@ -8,6 +8,6 @@ Embed this gem until gitlab moved to 7.x version
gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model' gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
-gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' -gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
+gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails' +gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
gem 'elasticsearch-api', '~> 6.8', '>= 6.8.2' gem 'elasticsearch-api', '~> 6.8','>= 6.8.2'
gem 'aws-sdk-core', '~> 3' gem 'aws-sdk-core', '~> 3'
gem 'aws-sdk-cloudformation', '~> 1' gem 'aws-sdk-cloudformation', '~> 1'

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

@ -16,7 +16,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', '~> 1.5' -gem 'gitlab-license', '~> 2.0'
- -
# Protect against bruteforcing # Protect against bruteforcing
gem 'rack-attack', '~> 6.3' gem 'rack-attack', '~> 6.3'

6
debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch vendored
View file

@ -3,11 +3,11 @@ Allow newer version in the archive to satisfy the requirement
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -193,7 +193,7 @@ @@ -193,7 +193,7 @@
gem 'sidekiq', '~> 5.2', '>= 5.2.7' gem 'sidekiq', '~> 5.2','>= 5.2.7'
gem 'sidekiq-cron', '~> 1.0' gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.7' gem 'redis-namespace', '~> 1.8','>= 1.8.1'
-gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch' -gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch'
+gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch' +gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch'
# Cron Parser # Cron Parser
gem 'fugit', '~> 1.2', '>= 1.2.1' gem 'fugit', '~> 1.2','>= 1.2.1'

6
debian/patches/0486-relax-sidekiq.patch vendored
View file

@ -6,8 +6,8 @@ ruby-sidekiq 6 is in unstable
gem 'acts-as-taggable-on', '~> 7.0' gem 'acts-as-taggable-on', '~> 7.0'
# Background jobs # Background jobs
-gem 'sidekiq', '~> 5.2', '>= 5.2.7' -gem 'sidekiq', '~> 5.2','>= 5.2.7'
+gem 'sidekiq', '< 7.0', '>= 5.2.7' +gem 'sidekiq', '< 7.0','>= 5.2.7'
gem 'sidekiq-cron', '~> 1.0' gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.7' gem 'redis-namespace', '~> 1.8','>= 1.8.1'
gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch' gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch'

4
debian/patches/0499-10-relax-capybara.patch vendored
View file

@ -1,11 +1,11 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -379,7 +379,7 @@ @@ -371,7 +371,7 @@
gem 'rspec_profiling', '~> 0.0.6' gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false
- gem 'capybara', '~> 3.35', '~> 3.35.3' - gem 'capybara', '~> 3.35', '~> 3.35.3'
+ gem 'capybara', '~> 3.12' + gem 'capybara', '~> 3.12'
gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22' gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
gem 'selenium-webdriver', '~> 3.142' gem 'selenium-webdriver', '~> 3.1','>= 3.142'

4
debian/patches/0499-20-remove-capybara-screenshot.patch vendored
View file

@ -1,10 +1,10 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -380,7 +380,6 @@ @@ -372,7 +372,6 @@
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.12' gem 'capybara', '~> 3.12'
- gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22' - gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
gem 'selenium-webdriver', '~> 3.142' gem 'selenium-webdriver', '~> 3.1','>= 3.142'
gem 'shoulda-matchers', '~> 4.0', '>= 4.0.1', require: false gem 'shoulda-matchers', '~> 4.0', '>= 4.0.1', require: false

2
debian/patches/0499-30-remove-guard-rspec.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -389,7 +389,6 @@ @@ -381,7 +381,6 @@
gem 'concurrent-ruby', '~> 1.1' gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0' gem 'test-prof', '~> 0.12.0'
gem 'rspec_junit_formatter' gem 'rspec_junit_formatter'

8
debian/patches/0500-set-webpack-root.patch vendored
View file

@ -2,12 +2,12 @@ Debian specific patch to help webpack find sources
--- a/config/webpack.config.js --- a/config/webpack.config.js
+++ b/config/webpack.config.js +++ b/config/webpack.config.js
@@ -20,7 +20,7 @@ @@ -24,7 +24,7 @@
const MonacoWebpackPlugin = require('./plugins/monaco_webpack'); const MonacoWebpackPlugin = require('./plugins/monaco_webpack');
-const ROOT_PATH = path.resolve(__dirname, '..'); -const ROOT_PATH = path.resolve(__dirname, '..');
+const ROOT_PATH = '/usr/share/gitlab'; +const ROOT_PATH = '/usr/share/gitlab';
const VENDOR_DLL = process.env.WEBPACK_VENDOR_DLL && process.env.WEBPACK_VENDOR_DLL !== 'false'; const SUPPORTED_BROWSERS = fs.readFileSync(path.join(ROOT_PATH, '.browserslistrc'), 'utf-8');
const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache'); const SUPPORTED_BROWSERS_HASH = crypto
const IS_PRODUCTION = process.env.NODE_ENV === 'production'; .createHash('sha256')

8
debian/patches/0510-remove-dev-dependencies.patch vendored
View file

@ -2,12 +2,12 @@ These are not required in production
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -191,69 +191,6 @@ @@ -200,71 +200,6 @@
"xterm": "3.14.5" "xterm": "3.14.5"
}, },
"devDependencies": { "devDependencies": {
- "@babel/plugin-transform-modules-commonjs": "^7.10.1", - "@babel/plugin-transform-modules-commonjs": "^7.10.1",
- "@gitlab/eslint-plugin": "8.4.0", - "@gitlab/eslint-plugin": "9.0.2",
- "@gitlab/stylelint-config": "2.3.0", - "@gitlab/stylelint-config": "2.3.0",
- "@testing-library/dom": "^7.16.2", - "@testing-library/dom": "^7.16.2",
- "@vue/test-utils": "1.2.0", - "@vue/test-utils": "1.2.0",
@ -21,7 +21,7 @@ These are not required in production
- "commander": "^2.18.0", - "commander": "^2.18.0",
- "custom-jquery-matchers": "^2.1.0", - "custom-jquery-matchers": "^2.1.0",
- "docdash": "^1.0.2", - "docdash": "^1.0.2",
- "eslint": "7.28.0", - "eslint": "7.31.0",
- "eslint-import-resolver-jest": "3.0.0", - "eslint-import-resolver-jest": "3.0.0",
- "eslint-import-resolver-webpack": "0.13.1", - "eslint-import-resolver-webpack": "0.13.1",
- "eslint-plugin-jasmine": "4.1.2", - "eslint-plugin-jasmine": "4.1.2",
@ -59,6 +59,8 @@ These are not required in production
- "nodemon": "^2.0.4", - "nodemon": "^2.0.4",
- "postcss": "^7.0.14", - "postcss": "^7.0.14",
- "prettier": "2.2.1", - "prettier": "2.2.1",
- "prosemirror-schema-basic": "^1.1.2",
- "prosemirror-test-builder": "^1.0.4",
- "purgecss": "^4.0.3", - "purgecss": "^4.0.3",
- "purgecss-from-html": "^4.0.3", - "purgecss-from-html": "^4.0.3",
- "readdir-enhanced": "^2.2.4", - "readdir-enhanced": "^2.2.4",

39
debian/patches/0740-use-packaged-modules.patch vendored
View file

@ -20,15 +20,15 @@ Use debian packaged node modules when available
--- a/config/webpack.config.js --- a/config/webpack.config.js
+++ b/config/webpack.config.js +++ b/config/webpack.config.js
@@ -10,7 +10,6 @@ @@ -14,7 +14,6 @@
const VUE_LOADER_VERSION = require('vue-loader/package.json').version;
const VUE_VERSION = require('vue/package.json').version; const VUE_VERSION = require('vue/package.json').version;
const webpack = require('webpack'); const webpack = require('webpack');
-const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer'); -const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
const { StatsWriterPlugin } = require('webpack-stats-plugin'); const { StatsWriterPlugin } = require('webpack-stats-plugin');
const WEBPACK_VERSION = require('webpack/package.json').version; const WEBPACK_VERSION = require('webpack/package.json').version;
@@ -188,6 +187,8 @@ @@ -198,6 +197,8 @@
entry: generateEntries, entry: generateEntries,
@ -37,7 +37,7 @@ Use debian packaged node modules when available
output: { output: {
path: WEBPACK_OUTPUT_PATH, path: WEBPACK_OUTPUT_PATH,
publicPath: WEBPACK_PUBLIC_PATH, publicPath: WEBPACK_PUBLIC_PATH,
@@ -197,10 +198,15 @@ @@ -207,10 +208,15 @@
}, },
resolve: { resolve: {
@ -54,7 +54,7 @@ Use debian packaged node modules when available
module: { module: {
strictExportPresence: true, strictExportPresence: true,
rules: [ rules: [
@@ -211,9 +217,13 @@ @@ -221,9 +227,13 @@
}, },
{ {
test: /\.js$/, test: /\.js$/,
@ -69,7 +69,7 @@ Use debian packaged node modules when available
loader: 'babel-loader', loader: 'babel-loader',
options: { options: {
cacheDirectory: path.join(CACHE_PATH, 'babel-loader'), cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
@@ -290,7 +300,7 @@ @@ -310,7 +320,7 @@
}, },
{ {
test: /\.(eot|ttf|woff|woff2)$/, test: /\.(eot|ttf|woff|woff2)$/,
@ -78,7 +78,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]',
@@ -579,19 +589,6 @@ @@ -601,19 +611,6 @@
// enable HMR only in webpack-dev-server // enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(), DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@ -98,7 +98,7 @@ Use debian packaged node modules when available
new webpack.DefinePlugin({ new webpack.DefinePlugin({
// This one is used to define window.gon.ee and other things properly in tests: // This one is used to define window.gon.ee and other things properly in tests:
'process.env.IS_EE': JSON.stringify(IS_EE), 'process.env.IS_EE': JSON.stringify(IS_EE),
@@ -628,6 +625,7 @@ @@ -650,6 +647,7 @@
node: { node: {
fs: 'empty', // sqljs requires fs fs: 'empty', // sqljs requires fs
@ -108,7 +108,7 @@ Use debian packaged node modules when available
}; };
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -46,19 +46,19 @@ @@ -49,19 +49,19 @@
"webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js" "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
}, },
"dependencies": { "dependencies": {
@ -126,16 +126,16 @@ Use debian packaged node modules when available
+ "@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": "1.199.0", "@gitlab/svgs": "1.202.0",
"@gitlab/tributejs": "1.0.0", "@gitlab/tributejs": "1.0.0",
"@gitlab/ui": "29.35.0", "@gitlab/ui": "31.5.0",
"@gitlab/visual-review-tools": "1.6.1", "@gitlab/visual-review-tools": "1.6.1",
- "@rails/actioncable": "6.1.3-2", - "@rails/actioncable": "6.1.3-2",
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable", + "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
"@rails/ujs": "6.1.3-2", "@rails/ujs": "6.1.3-2",
"@sentry/browser": "5.26.0", "@sentry/browser": "5.26.0",
"@sourcegraph/code-host-integration": "0.0.57", "@sourcegraph/code-host-integration": "0.0.58",
@@ -96,7 +96,7 @@ @@ -103,7 +103,7 @@
"aws-sdk": "^2.637.0", "aws-sdk": "^2.637.0",
"axios": "^0.20.0", "axios": "^0.20.0",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.2",
@ -144,7 +144,7 @@ Use debian packaged node modules when available
"bootstrap": "4.5.3", "bootstrap": "4.5.3",
"cache-loader": "^4.1.0", "cache-loader": "^4.1.0",
"clipboard": "^1.7.1", "clipboard": "^1.7.1",
@@ -130,29 +130,29 @@ @@ -137,30 +137,30 @@
"jquery": "^3.6.0", "jquery": "^3.6.0",
"jquery.caret": "^0.3.1", "jquery.caret": "^0.3.1",
"jquery.waitforimages": "^2.2.0", "jquery.waitforimages": "^2.2.0",
@ -166,10 +166,11 @@ Use debian packaged node modules when available
"mermaid": "^8.10.2", "mermaid": "^8.10.2",
- "minimatch": "^3.0.4", - "minimatch": "^3.0.4",
+ "minimatch": "link:/usr/share/nodejs/minimatch", + "minimatch": "link:/usr/share/nodejs/minimatch",
"monaco-editor": "^0.20.0", "monaco-editor": "^0.25.2",
"monaco-editor-webpack-plugin": "^1.9.1", "monaco-editor-webpack-plugin": "^4.0.0",
"monaco-yaml": "^2.5.1", "monaco-yaml": "^2.5.1",
"mousetrap": "1.6.5", "mousetrap": "1.6.5",
"papaparse": "^5.3.1",
- "pdfjs-dist": "^2.0.943", - "pdfjs-dist": "^2.0.943",
+ "pdfjs-dist": "link:/usr/share/nodejs/pdfjs-dist", + "pdfjs-dist": "link:/usr/share/nodejs/pdfjs-dist",
"pikaday": "^1.8.0", "pikaday": "^1.8.0",
@ -182,10 +183,10 @@ Use debian packaged node modules when available
- "prosemirror-model": "^1.13.3", - "prosemirror-model": "^1.13.3",
+ "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown", + "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
+ "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model", + "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
"prosemirror-state": "^1.3.4",
"raphael": "^2.2.7", "raphael": "^2.2.7",
"raw-loader": "^4.0.2", "raw-loader": "^4.0.2",
"scrollparent": "^2.0.1", @@ -173,27 +173,26 @@
@@ -164,27 +164,26 @@
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
"swagger-ui-dist": "^3.44.1", "swagger-ui-dist": "^3.44.1",
"three": "^0.84.0", "three": "^0.84.0",
@ -232,7 +233,7 @@ Use debian packaged node modules when available
+ '@babel/plugin-proposal-nullish-coalescing-operator', + '@babel/plugin-proposal-nullish-coalescing-operator',
// See: https://gitlab.com/gitlab-org/gitlab/-/issues/229146 // See: https://gitlab.com/gitlab-org/gitlab/-/issues/229146
'@babel/plugin-transform-arrow-functions', '@babel/plugin-transform-arrow-functions',
'lodash', // See: https://gitlab.com/gitlab-org/gitlab/-/issues/336216
--- a/app/assets/javascripts/pdf/index.vue --- a/app/assets/javascripts/pdf/index.vue
+++ b/app/assets/javascripts/pdf/index.vue +++ b/app/assets/javascripts/pdf/index.vue
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@