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 2021-03-11 21:09:22 +05:30
parent 8aebb619f3
commit 99c75becf3
27 changed files with 140 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,11 +3,12 @@ gitlab Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -1,16 +1,16 @@
@@ -2,53 +2,53 @@
source 'https://rubygems.org'
-gem 'rails', '~> 6.0.3.1'
+gem 'rails', '~> 6.0.3'
+gem 'rails', '~> 6.0.3', '>= 6.0.3.1'
-gem 'bootsnap', '~> 1.4.6'
+gem 'bootsnap', '~> 1.4', '>= 1.4.6'
@ -19,14 +20,34 @@ gitlab Gemfile
+gem 'sprockets', '~> 3.7'
# Default values for AR models
-gem 'default_value_for', '~> 3.3.0'
+gem 'default_value_for', '~> 3.3'
-gem 'default_value_for', '~> 3.4.0'
+gem 'default_value_for', '~> 3.4'
# Supported DBs
gem 'pg', '~> 1.1'
@@ -30,23 +30,23 @@
-gem 'rugged', '~> 1.0.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'
-gem 'marginalia', '~> 1.10.0'
+gem 'marginalia', '~> 1.10'
# 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 'doorkeeper', '~> 5.5.0.rc2'
-gem 'doorkeeper-openid_connect', '~> 1.7.5'
+gem 'bcrypt', '~> 3.1', '>= 3.1.12'
+gem 'doorkeeper', '~> 5.5'
+gem 'doorkeeper-openid_connect', '~> 1.7', '>= 1.7.5'
gem 'omniauth', '~> 1.8'
gem 'omniauth-auth0', '~> 2.0.0'
-gem 'omniauth-auth0', '~> 2.0.0'
+gem 'omniauth-auth0', '~> 2.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
-gem 'omniauth-cas3', '~> 1.1.4'
-gem 'omniauth-facebook', '~> 4.0.0'
@ -56,7 +77,7 @@ gitlab Gemfile
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
@@ -54,17 +54,17 @@
@@ -56,17 +56,17 @@
# Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0'
@ -79,7 +100,7 @@ gitlab Gemfile
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.6'
@@ -72,27 +72,27 @@
@@ -74,27 +74,27 @@
gem 'browser', '~> 4.2'
# GPG
@ -94,8 +115,8 @@ gitlab Gemfile
gem 'net-ldap', '~> 0.16.3'
# API
-gem 'grape', '~> 1.5.1'
+gem 'grape', '~> 1.5', '>= 1.5.1'
-gem 'grape', '~> 1.5.2'
+gem 'grape', '~> 1.5', '>= 1.5.2'
gem 'grape-entity', '~> 0.7.1'
-gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
+gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
@ -115,12 +136,12 @@ gitlab Gemfile
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
gem 'hashie'
@@ -103,17 +103,17 @@
@@ -105,11 +105,11 @@
gem 'kaminari', '~> 1.0'
# HAML
-gem 'hamlit', '~> 2.11.0'
+gem 'hamlit', '~> 2.11'
-gem 'hamlit', '~> 2.14.4'
+gem 'hamlit', '~> 2.14', '>= 2.14.4'
# Files attachments
gem 'carrierwave', '~> 1.3'
@ -129,14 +150,7 @@ gitlab Gemfile
# for backups
gem 'fog-aws', '~> 3.8'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
-gem 'fog-core', '= 2.1.0'
+gem 'fog-core', '= 2.1'
gem 'fog-google', '~> 1.12'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
@@ -128,37 +128,37 @@
@@ -130,37 +130,37 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -176,7 +190,7 @@ gitlab Gemfile
+gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
gem 'asciidoctor-kroki', '~> 0.2.2', require: false
gem 'asciidoctor-kroki', '~> 0.4.0', require: false
-gem 'rouge', '~> 3.26.0'
+gem 'rouge', '~> 3.26'
gem 'truncato', '~> 0.7.11'
@ -187,7 +201,7 @@ gitlab Gemfile
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -169,7 +169,7 @@
@@ -171,7 +171,7 @@
gem 'diff_match_patch', '~> 0.1.0'
# Application server
@ -196,7 +210,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'
@@ -179,7 +179,7 @@
@@ -181,7 +181,7 @@
end
group :puma do
@ -205,7 +219,7 @@ gitlab Gemfile
gem 'puma_worker_killer', '~> 0.3.1', require: false
end
@@ -190,13 +190,13 @@
@@ -192,13 +192,13 @@
gem 'acts-as-taggable-on', '~> 7.0'
# Background jobs
@ -222,7 +236,7 @@ gitlab Gemfile
# HTTP requests
gem 'httparty', '~> 0.16.4'
@@ -208,14 +208,14 @@
@@ -210,14 +210,14 @@
gem 'ruby-progressbar', '~> 1.10'
# GitLab settings
@ -240,7 +254,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.4'
@@ -228,23 +228,23 @@
@@ -230,23 +230,23 @@
gem 'connection_pool', '~> 2.0'
# Redis session store
@ -268,7 +282,7 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -256,11 +256,11 @@
@@ -258,11 +258,11 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -283,19 +297,21 @@ gitlab Gemfile
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -283,8 +283,8 @@
@@ -285,9 +285,9 @@
gem 'rack-proxy', '~> 0.6.0'
-gem 'sassc-rails', '~> 2.1.0'
-gem 'autoprefixer-rails', '10.2.0.0'
-gem 'terser', '1.0.2'
+gem 'sassc-rails', '~> 2.1'
+gem 'autoprefixer-rails', '~> 10.2'
+gem 'terser', '~> 1.0', '>= 1.0.2'
gem 'addressable', '~> 2.7'
gem 'gemojione', '~> 3.3'
@@ -295,7 +295,7 @@
gem "gitlab-license", "~> 1.0"
@@ -298,18 +298,18 @@
gem "gitlab-license", "~> 1.3"
# Protect against bruteforcing
-gem 'rack-attack', '~> 6.3.0'
@ -303,9 +319,10 @@ gitlab Gemfile
# Sentry integration
gem 'sentry-raven', '~> 3.0'
@@ -303,10 +303,10 @@
# PostgreSQL query parsing
gem 'pg_query', '~> 1.3.0'
-gem 'pg_query', '~> 1.3.0'
+gem 'pg_query', '~> 1.3'
-gem 'premailer-rails', '~> 1.10.3'
+gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
@ -316,7 +333,7 @@ gitlab Gemfile
# 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'
@@ -314,11 +314,11 @@
@@ -317,11 +317,11 @@
# I18n
gem 'ruby_parser', '~> 3.15', require: false
gem 'rails-i18n', '~> 6.0'
@ -330,14 +347,14 @@ gitlab Gemfile
# Perf bar
gem 'peek', '~> 1.1'
@@ -350,39 +350,39 @@
@@ -354,39 +354,39 @@
end
group :development, :test do
- gem 'deprecation_toolkit', '~> 1.5.1', require: false
- gem 'bullet', '~> 6.1.0'
- gem 'bullet', '~> 6.1.3'
+ gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
+ gem 'bullet', '~> 6.1'
+ gem 'bullet', '~> 6.1', '>= 6.1.3'
gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
gem 'pry-rails', '~> 0.3.9'
gem 'pry-remote'
@ -346,10 +363,10 @@ gitlab Gemfile
- gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 6.1.0'
- gem 'rspec-rails', '~> 4.0.1'
- gem 'rspec-rails', '~> 4.0.2'
+ gem 'database_cleaner', '~> 1.7'
+ gem 'factory_bot_rails', '~> 6.1'
+ gem 'rspec-rails', '~> 4.0', '>= 4.0.1'
+ gem 'rspec-rails', '~> 4.0', '>= 4.0.2'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.11.0'
@ -368,7 +385,7 @@ gitlab Gemfile
gem 'scss_lint', '~> 0.59.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.6.1', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
- gem 'benchmark-ips', '~> 2.3.0', require: false
+ gem 'benchmark-ips', '~> 2.3', require: false
@ -381,7 +398,7 @@ gitlab Gemfile
gem 'timecop', '~> 0.9.1'
@@ -404,18 +404,18 @@
@@ -408,18 +408,18 @@
end
group :test do
@ -406,7 +423,7 @@ gitlab Gemfile
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0'
@@ -434,7 +434,7 @@
@@ -438,7 +438,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -415,7 +432,7 @@ gitlab Gemfile
gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
@@ -448,8 +448,8 @@
@@ -452,8 +452,8 @@
gem 'health_check', '~> 3.0'
# System information
@ -426,12 +443,12 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -465,13 +465,13 @@
@@ -469,13 +469,13 @@
end
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.8.0.pre.rc2'
+gem 'gitaly', '~> 13.8'
-gem 'gitaly', '~> 13.9.0.pre.rc1'
+gem 'gitaly', '~> 13.9'
-gem 'grpc', '~> 1.30.2'
+gem 'grpc', '~> 1.30', '>= 1.30.2'
@ -443,7 +460,7 @@ gitlab Gemfile
# Feature toggles
gem 'flipper', '~> 0.17.1'
@@ -490,12 +490,12 @@
@@ -494,12 +494,12 @@
# Countries list
gem 'countries', '~> 3.0'
@ -458,7 +475,7 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -509,12 +509,12 @@
@@ -513,12 +513,12 @@
gem 'valid_email', '~> 0.1'
# JSON

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

@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
--- a/Gemfile
+++ b/Gemfile
@@ -92,7 +92,6 @@
@@ -94,7 +94,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,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 'hashie'
@@ -316,7 +315,6 @@
@@ -319,7 +318,6 @@
gem 'rails-i18n', '~> 6.0'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
@ -18,13 +18,14 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 1.4'
@@ -336,19 +334,6 @@
@@ -339,20 +337,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'
-
@ -32,13 +33,13 @@ Bundler will fail when it can't find these locally
- gem 'better_errors', '~> 2.7.1'
-
- # thin instead webrick
- gem 'thin', '~> 1.7.0'
- gem 'thin', '~> 1.8.0'
-end
-
group :development, :test do
gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
gem 'bullet', '~> 6.1'
@@ -371,12 +356,6 @@
gem 'bullet', '~> 6.1', '>= 6.1.3'
@@ -375,12 +359,6 @@
gem 'spring', '~> 2.1'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
@ -46,12 +47,12 @@ Bundler will fail when it can't find these locally
-
- gem 'scss_lint', '~> 0.59.0', require: false
- gem 'haml_lint', '~> 0.36.0', require: false
- gem 'bundler-audit', '~> 0.6.1', require: false
- gem 'bundler-audit', '~> 0.7.0.1', require: false
-
gem 'benchmark-ips', '~> 2.3', require: false
gem 'knapsack', '~> 1.17'
@@ -393,16 +372,6 @@
@@ -397,16 +375,6 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
end

6
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
+++ b/Gemfile
@@ -334,7 +334,7 @@
@@ -337,7 +337,7 @@
gem 'raindrops', '~> 0.18'
end
-group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
gem 'bullet', '~> 6.1'
gem 'bullet', '~> 6.1', '>= 6.1.3'
gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
@@ -370,9 +370,7 @@
@@ -373,9 +373,7 @@
gem 'parallel', '~> 1.19', require: false
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false

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

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

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

@ -2,7 +2,7 @@ Allow rdoc from ruby 2.5 to match requirement
--- a/Gemfile
+++ b/Gemfile
@@ -146,7 +146,7 @@
@@ -148,7 +148,7 @@
gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3'
gem 'RedCloth', '~> 4.3', '>= 4.3.2'

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

@ -4,7 +4,7 @@ maintaining two almost same packages.
--- a/Gemfile
+++ b/Gemfile
@@ -141,7 +141,6 @@
@@ -143,7 +143,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
View file

@ -3,7 +3,7 @@ gitlab-puma changes is included in puma package.
--- a/Gemfile
+++ b/Gemfile
@@ -171,11 +171,6 @@
@@ -173,11 +173,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
debian/patches/0480-embed-elasticsearch-model.patch vendored
View file

@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
--- a/Gemfile
+++ b/Gemfile
@@ -130,7 +130,7 @@
@@ -132,7 +132,7 @@
gem 'seed-fu', '~> 2.3', '>= 2.3.7'
# Search

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

@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
--- a/Gemfile
+++ b/Gemfile
@@ -131,7 +131,7 @@
@@ -133,7 +133,7 @@
# Search
gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'

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

@ -2,7 +2,7 @@ This gem is used only in gitlab Enterprise Edition
--- a/Gemfile
+++ b/Gemfile
@@ -48,9 +48,6 @@
@@ -50,9 +50,6 @@
gem 'rack-oauth2', '~> 1.16'
gem 'jwt', '~> 2.1'
@ -12,11 +12,11 @@ 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'
@@ -285,8 +282,6 @@
@@ -288,8 +285,6 @@
gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0'
-gem "gitlab-license", "~> 1.0"
-gem "gitlab-license", "~> 1.3"
-
# Protect against bruteforcing
gem 'rack-attack', '~> 6.3'

4
debian/patches/0484-relax-grape-entity.patch vendored
View file

@ -2,10 +2,10 @@ Debian already has 0.8
--- a/Gemfile
+++ b/Gemfile
@@ -79,7 +79,7 @@
@@ -81,7 +81,7 @@
# API
gem 'grape', '~> 1.5', '>= 1.5.1'
gem 'grape', '~> 1.5', '>= 1.5.2'
-gem 'grape-entity', '~> 0.7.1'
+gem 'grape-entity', '~> 0.8'
gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'

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

@ -2,7 +2,7 @@ Allow newer version in the archive to satisfy the requirement
--- a/Gemfile
+++ b/Gemfile
@@ -183,7 +183,7 @@
@@ -185,7 +185,7 @@
gem 'sidekiq', '~> 5.2', '>= 5.2.7'
gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.7'

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

@ -2,7 +2,7 @@ ruby-sidekiq 6 is in unstable
--- a/Gemfile
+++ b/Gemfile
@@ -180,7 +180,7 @@
@@ -182,7 +182,7 @@
gem 'acts-as-taggable-on', '~> 7.0'
# Background jobs

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -365,7 +365,7 @@
@@ -368,7 +368,7 @@
gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -366,7 +366,6 @@
@@ -369,7 +369,6 @@
gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.12'

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

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

4
debian/patches/0499-40-relax-rouge.patch vendored
View file

@ -3,10 +3,10 @@ rouge update is blocked by
--- a/Gemfile
+++ b/Gemfile
@@ -150,7 +150,7 @@
@@ -152,7 +152,7 @@
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
gem 'asciidoctor-kroki', '~> 0.2.2', require: false
gem 'asciidoctor-kroki', '~> 0.4.0', require: false
-gem 'rouge', '~> 3.26'
+gem 'rouge', '~> 3.21'
gem 'truncato', '~> 0.7.11'

2
debian/patches/0499-70-relax-graphlient.patch vendored
View file

@ -2,7 +2,7 @@ newer version is in the archive
--- a/Gemfile
+++ b/Gemfile
@@ -89,7 +89,7 @@
@@ -91,7 +91,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'

12
debian/patches/0499-80-relax-bcrypt.patch vendored
View file

@ -1,12 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -23,8 +23,7 @@
# Authentication libraries
gem 'devise', '~> 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.3.0'
gem 'doorkeeper-openid_connect', '~> 1.7.4'
gem 'omniauth', '~> 1.8'

2
debian/patches/0499-90-relax-webrick.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -315,7 +315,7 @@
@@ -319,7 +319,7 @@
# Metrics
group :metrics do
gem 'method_source', '~> 1.0', require: false

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

@ -2,9 +2,9 @@ Debian specific patch to help webpack find sources
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -10,7 +10,7 @@
const CopyWebpackPlugin = require('copy-webpack-plugin');
@@ -11,7 +11,7 @@
const vendorDllHash = require('./helpers/vendor_dll_hash');
const createIncrementalWebpackCompiler = require('./helpers/incremental_webpack_compiler');
-const ROOT_PATH = path.resolve(__dirname, '..');
+const ROOT_PATH = '/usr/share/gitlab';

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

@ -2,12 +2,12 @@ These are not required in production
--- a/package.json
+++ b/package.json
@@ -162,65 +162,6 @@
@@ -154,69 +154,7 @@
"xterm": "3.14.5"
},
"devDependencies": {
- "@babel/plugin-transform-modules-commonjs": "^7.10.1",
- "@gitlab/eslint-plugin": "6.0.0",
- "@gitlab/eslint-plugin": "8.0.0",
- "@testing-library/dom": "^7.16.2",
- "@vue/test-utils": "1.1.2",
- "acorn": "^6.3.0",
@ -19,16 +19,17 @@ These are not required in production
- "commander": "^2.18.0",
- "custom-jquery-matchers": "^2.1.0",
- "docdash": "^1.0.2",
- "eslint": "^6.8.0",
- "eslint-import-resolver-jest": "^2.1.1",
- "eslint-import-resolver-webpack": "^0.12.1",
- "eslint-plugin-jasmine": "^4.1.0",
- "eslint-plugin-no-jquery": "^2.3.0",
- "gettext-extractor": "^3.4.3",
- "gettext-extractor-vue": "^4.0.2",
- "eslint": "7.19.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",
- "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",
@ -37,6 +38,7 @@ These are not required in production
- "jest-environment-jsdom": "^26.5.2",
- "jest-junit": "^12.0.0",
- "jest-raw-loader": "^1.0.1",
- "jest-transform-graphql": "^2.1.0",
- "jest-util": "^26.5.2",
- "jsdoc": "^3.5.5",
- "jsdoc-vue": "^1.0.0",
@ -50,9 +52,10 @@ These are not required in production
- "karma-webpack": "^4.0.2",
- "markdownlint-cli": "0.24.0",
- "md5": "^2.2.1",
- "miragejs": "^0.1.40",
- "mock-apollo-client": "^0.5.0",
- "node-sass": "^4.14.1",
- "nodemon": "^2.0.4",
- "pixelmatch": "^4.0.2",
- "postcss": "^7.0.14",
- "prettier": "2.2.1",
- "readdir-enhanced": "^2.2.4",
@ -61,10 +64,12 @@ These are not required in production
- "stylelint-scss": "^3.9.2",
- "timezone-mock": "^1.0.8",
- "vue-jest": "4.0.0-rc.0",
- "webpack-dev-server": "^3.10.3",
- "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
debian/patches/0520-add-system-lib-path-for-webpack.patch vendored
View file

@ -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
@@ -175,9 +175,14 @@
@@ -185,9 +185,14 @@
resolve: {
extensions: ['.js', '.gql', '.graphql'],

2
debian/patches/0530-typescript-yarnpkg-comapt.patch vendored
View file

@ -4,7 +4,7 @@ Bug: https://github.com/yarnpkg/berry/pull/2440
--- a/package.json
+++ b/package.json
@@ -168,7 +168,8 @@
@@ -160,7 +160,8 @@
},
"resolutions": {
"chokidar": "^3.4.0",

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

@ -27,8 +27,8 @@ Use debian packaged node modules when available
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const CopyWebpackPlugin = require('copy-webpack-plugin');
const vendorDllHash = require('./helpers/vendor_dll_hash');
@@ -165,6 +164,8 @@
const createIncrementalWebpackCompiler = require('./helpers/incremental_webpack_compiler');
@@ -175,6 +174,8 @@
entry: generateEntries,
@ -37,7 +37,7 @@ Use debian packaged node modules when available
output: {
path: WEBPACK_OUTPUT_PATH,
publicPath: WEBPACK_PUBLIC_PATH,
@@ -174,13 +175,13 @@
@@ -184,13 +185,13 @@
},
resolve: {
@ -54,7 +54,7 @@ Use debian packaged node modules when available
},
module: {
@@ -193,9 +194,13 @@
@@ -203,9 +204,13 @@
},
{
test: /\.js$/,
@ -69,7 +69,7 @@ Use debian packaged node modules when available
loader: 'babel-loader',
options: {
cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
@@ -272,7 +277,7 @@
@@ -282,7 +287,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]',
@@ -551,19 +556,6 @@
@@ -565,19 +570,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),
@@ -598,6 +590,7 @@
@@ -614,6 +606,7 @@
node: {
fs: 'empty', // sqljs requires fs
@ -108,85 +108,8 @@ Use debian packaged node modules when available
};
--- a/package.json
+++ b/package.json
@@ -35,12 +35,12 @@
"webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
},
"dependencies": {
- "@babel/core": "^7.10.1",
- "@babel/plugin-proposal-class-properties": "^7.10.1",
- "@babel/plugin-proposal-json-strings": "^7.10.1",
- "@babel/plugin-proposal-private-methods": "^7.10.1",
- "@babel/plugin-syntax-import-meta": "^7.10.1",
- "@babel/preset-env": "^7.10.1",
+ "@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",
"@gitlab/at.js": "1.5.5",
"@gitlab/favicon-overlay": "2.0.0",
"@gitlab/svgs": "1.178.0",
@@ -57,29 +57,29 @@
"apollo-link": "^1.2.14",
"apollo-link-batch-http": "^1.2.14",
"apollo-upload-client": "^13.0.0",
- "autosize": "^4.0.2",
+ "autosize": "link:/usr/share/nodejs/autosize",
"aws-sdk": "^2.637.0",
- "axios": "^0.20.0",
+ "axios": "link:/usr/share/nodejs/axios",
"babel-loader": "^8.0.6",
"babel-plugin-lodash": "^3.3.4",
"bootstrap": "4.4.1",
"brace-expansion": "^1.1.8",
"cache-loader": "^4.1.0",
- "clipboard": "^1.7.1",
- "codemirror": "^5.48.4",
+ "clipboard": "link:/usr/share/nodejs/clipboard",
+ "codemirror": "link:/usr/share/nodejs/codemirror",
"codesandbox-api": "0.0.23",
"compression-webpack-plugin": "^3.0.1",
"copy-webpack-plugin": "^5.0.5",
- "core-js": "^3.6.4",
+ "core-js": "link:/usr/share/nodejs/core-js",
"cron-validator": "^1.1.1",
"cropper": "^2.3.0",
"css-loader": "^2.1.1",
- "d3": "^5.16.0",
- "d3-sankey": "^0.12.3",
- "d3-scale": "^2.2.2",
- "d3-selection": "^1.2.0",
- "dateformat": "^3.0.3",
- "deckar01-task_list": "^2.3.1",
+ "d3": "link:/usr/share/nodejs/d3",
+ "d3-sankey": "link:/usr/share/nodejs/d3-sankey",
+ "d3-scale": "link:/usr/share/nodejs/d3-scale",
+ "d3-selection": "link:/usr/share/nodejs/d3-selection",
+ "dateformat": "link:/usr/share/nodejs/dateformat",
+ "deckar01-task_list": "link:/usr/share/nodejs/deckar01-task_list",
"diff": "^3.4.0",
"document-register-element": "1.14.3",
"dompurify": "^2.2.6",
@@ -90,41 +90,41 @@
"exports-loader": "^0.7.0",
"fast-mersenne-twister": "1.0.2",
"file-loader": "^5.1.0",
- "font-awesome": "4.7.0",
+ "font-awesome": "link:/usr/share/nodejs/font-awesome",
"fuzzaldrin-plus": "^0.6.0",
- "glob": "^7.1.6",
+ "glob": "link:/usr/share/nodejs/glob",
"graphql": "^15.4.0",
"graphql-tag": "^2.11.0",
"immer": "^7.0.7",
"imports-loader": "^0.8.0",
"ipaddr.js": "^1.9.1",
- "jed": "^1.1.1",
+ "jed": "link:/usr/share/nodejs/jed",
"jest-transform-graphql": "^2.1.0",
- "jquery": "^3.5.0",
+ "jquery": "link:/usr/share/nodejs/jquery",
@@ -98,26 +98,26 @@
"jquery": "^3.5.0",
"jquery.caret": "^0.3.1",
"jquery.waitforimages": "^2.2.0",
- "js-cookie": "^2.2.1",
@ -202,12 +125,10 @@ Use debian packaged node modules when available
"lodash": "^4.17.20",
"marked": "^0.3.12",
"mathjax": "3",
- "mermaid": "^8.5.2",
- "mermaid": "^8.9.0",
- "minimatch": "^3.0.4",
+ "mermaid": "link:/usr/share/nodejs/mermaid",
+ "minimatch": "link:/usr/share/nodejs/minimatch",
"miragejs": "^0.1.40",
"mock-apollo-client": "^0.5.0",
"monaco-editor": "^0.20.0",
"monaco-editor-webpack-plugin": "^1.9.0",
"monaco-yaml": "^2.5.1",
@ -223,9 +144,9 @@ Use debian packaged node modules when available
+ "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
+ "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
"raphael": "^2.2.7",
"raw-loader": "^4.0.0",
"raw-loader": "^4.0.2",
"select2": "3.5.2-browserify",
@@ -136,26 +136,25 @@
@@ -128,26 +128,25 @@
"style-loader": "^1.3.0",
"swagger-ui-dist": "^3.43.0",
"three": "^0.84.0",
@ -252,14 +173,14 @@ Use debian packaged node modules when available
"vuedraggable": "^2.23.0",
"vuex": "^3.6.0",
"web-vitals": "^0.2.4",
"webpack": "^4.42.0",
- "webpack-bundle-analyzer": "^3.6.0",
"webpack-cli": "^3.3.11",
"webpack": "^4.46.0",
- "webpack-bundle-analyzer": "^3.9.0",
"webpack-cli": "^3.3.12",
"webpack-stats-plugin": "^0.3.1",
"worker-loader": "^2.0.0",
--- a/babel.config.js
+++ b/babel.config.js
@@ -34,9 +34,12 @@
@@ -16,9 +16,12 @@
// include stage 3 proposals
const plugins = [
'@babel/plugin-syntax-import-meta',

8
debian/patches/0750-fix-relative-paths.patch vendored
View file

@ -2,7 +2,9 @@ Debian specific patch to adapt to debian policy mandated paths
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -1,6 +1,6 @@
@@ -1,8 +1,8 @@
# frozen_string_literal: true
-require_relative '../settings'
-require_relative '../object_store_settings'
-require_relative '../smime_signature_settings'
@ -14,7 +16,9 @@ Debian specific patch to adapt to debian policy mandated paths
Settings['shared'] ||= Settingslogic.new({})
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# Load the Rails application.
-require_relative 'application'
+require '/usr/share/gitlab/config/application'

1
debian/patches/series vendored
View file

@ -16,7 +16,6 @@
0499-30-remove-guard-rspec.patch
0499-40-relax-rouge.patch
0499-70-relax-graphlient.patch
0499-80-relax-bcrypt.patch
0499-90-relax-webrick.patch
0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch