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-01-29 14:51:13 +05:30
parent 88d9c276e6
commit d62cfca0ad
26 changed files with 97 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ gitlab Gemfile
# Supported DBs # Supported DBs
gem 'pg', '~> 1.1' gem 'pg', '~> 1.1'
@@ -22,34 +22,34 @@ @@ -22,34 +22,34 @@
gem 'grape-path-helpers', '~> 1.4' gem 'grape-path-helpers', '~> 1.5'
gem 'faraday', '~> 1.0' gem 'faraday', '~> 1.0'
-gem 'marginalia', '~> 1.9.0' -gem 'marginalia', '~> 1.9.0'
@ -69,9 +69,9 @@ gitlab Gemfile
-gem 'omniauth-salesforce', '~> 1.0.5' -gem 'omniauth-salesforce', '~> 1.0.5'
+gem 'omniauth-salesforce', '~> 1.0', '>= 1.0.5' +gem 'omniauth-salesforce', '~> 1.0', '>= 1.0.5'
gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
-gem 'rack-oauth2', '~> 1.9.3' -gem 'rack-oauth2', '~> 1.16.0'
-gem 'jwt', '~> 2.1.0' -gem 'jwt', '~> 2.1.0'
+gem 'rack-oauth2', '~> 1.9','>= 1.9.3' +gem 'rack-oauth2', '~> 1.16'
+gem 'jwt', '~> 2.1' +gem 'jwt', '~> 2.1'
# Kerberos authentication. EE-only # Kerberos authentication. EE-only
@ -129,10 +129,10 @@ gitlab Gemfile
+gem 'graphiql-rails', '~> 1.4', '>= 1.4.10' +gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
+gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2' +gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'
+gem 'graphql-docs', '~> 1.6', group: [:development, :test] +gem 'graphql-docs', '~> 1.6', group: [:development, :test]
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
gem 'hashie' gem 'hashie'
# Disable strong_params so that Mash does not respond to :permitted? @@ -108,17 +108,17 @@
@@ -107,17 +107,17 @@
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
@ -150,10 +150,10 @@ 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 'fog-google', '~> 1.10' gem 'fog-google', '~> 1.11'
gem 'fog-local', '~> 0.6' gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0' gem 'fog-openstack', '~> 1.0'
@@ -132,36 +132,36 @@ @@ -133,36 +133,36 @@
gem 'unf', '~> 0.1.4' gem 'unf', '~> 0.1.4'
# Seed data # Seed data
@ -193,8 +193,8 @@ gitlab Gemfile
+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 'rouge', '~> 3.24.0' -gem 'rouge', '~> 3.25.0'
+gem 'rouge', '~> 3.24' +gem 'rouge', '~> 3.25'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0' -gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.9' -gem 'nokogiri', '~> 1.10.9'
@ -203,16 +203,16 @@ gitlab Gemfile
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
# Calendar rendering # Calendar rendering
@@ -172,7 +172,7 @@ @@ -173,7 +173,7 @@
gem 'diff_match_patch', '~> 0.1.0' gem 'diff_match_patch', '~> 0.1.0'
# Application server # Application server
-gem 'rack', '~> 2.1.4' -gem 'rack', '~> 2.2.3'
+gem 'rack', '~> 2.0', '>= 2.1.4' +gem 'rack', '~> 2.2', '>= 2.2.3'
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
@@ -193,13 +193,13 @@ @@ -194,13 +194,13 @@
gem 'acts-as-taggable-on', '~> 6.0' gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs # Background jobs
@ -229,7 +229,7 @@ gitlab Gemfile
# HTTP requests # HTTP requests
gem 'httparty', '~> 0.16.4' gem 'httparty', '~> 0.16.4'
@@ -211,14 +211,14 @@ @@ -212,14 +212,14 @@
gem 'ruby-progressbar' gem 'ruby-progressbar'
# GitLab settings # GitLab settings
@ -247,7 +247,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript # Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.4' gem 'js_regex', '~> 3.4'
@@ -231,39 +231,39 @@ @@ -232,39 +232,39 @@
gem 'connection_pool', '~> 2.0' gem 'connection_pool', '~> 2.0'
# Redis session store # Redis session store
@ -295,16 +295,7 @@ gitlab Gemfile
# Sanitizes SVG input # Sanitizes SVG input
gem 'loofah', '~> 2.2' gem 'loofah', '~> 2.2'
@@ -272,7 +272,7 @@ @@ -287,8 +287,8 @@
gem 'licensee', '~> 8.9'
# Ace editor
-gem 'ace-rails-ap', '~> 4.1.0'
+gem 'ace-rails-ap', '~> 4.1'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7'
@@ -289,8 +289,8 @@
gem 'rack-proxy', '~> 0.6.0' gem 'rack-proxy', '~> 0.6.0'
@ -315,7 +306,7 @@ gitlab Gemfile
gem 'addressable', '~> 2.7' gem 'addressable', '~> 2.7'
gem 'font-awesome-rails', '~> 4.7' gem 'font-awesome-rails', '~> 4.7'
@@ -302,24 +302,24 @@ @@ -300,7 +300,7 @@
gem "gitlab-license", "~> 1.0" gem "gitlab-license", "~> 1.0"
# Protect against bruteforcing # Protect against bruteforcing
@ -324,16 +315,19 @@ gitlab Gemfile
# Sentry integration # Sentry integration
gem 'sentry-raven', '~> 3.0' gem 'sentry-raven', '~> 3.0'
@@ -308,19 +308,19 @@
# PostgreSQL query parsing
gem 'gitlab-pg_query', '~> 1.3', 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.12.2' -gem 'gitlab-labkit', '0.13.1'
+gem 'gitlab-labkit', '~> 0.12.2' +gem 'gitlab-labkit', '~> 0.13.1'
# I18n # I18n
gem 'ruby_parser', '~> 3.8', require: false gem 'ruby_parser', '~> 3.15', require: false
gem 'rails-i18n', '~> 6.0' gem 'rails-i18n', '~> 6.0'
-gem 'gettext_i18n_rails', '~> 1.8.0' -gem 'gettext_i18n_rails', '~> 1.8.0'
+gem 'gettext_i18n_rails', '~> 1.8' +gem 'gettext_i18n_rails', '~> 1.8'
@ -345,7 +339,7 @@ gitlab Gemfile
# Perf bar # Perf bar
gem 'peek', '~> 1.1' gem 'peek', '~> 1.1'
@@ -350,40 +350,40 @@ @@ -351,37 +351,37 @@
end end
group :development, :test do group :development, :test do
@ -361,7 +355,7 @@ gitlab Gemfile
- gem 'factory_bot_rails', '~> 5.1.0' - gem 'factory_bot_rails', '~> 5.1.0'
- gem 'rspec-rails', '~> 4.0.0' - gem 'rspec-rails', '~> 4.0.0'
+ gem 'database_cleaner', '~> 1.7' + gem 'database_cleaner', '~> 1.7'
+ gem 'factory_bot_rails', '~> 5.1', '>= 5.1.0' + gem 'factory_bot_rails', '~> 5.1'
+ gem 'rspec-rails', '~> 4.0' + gem 'rspec-rails', '~> 4.0'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
@ -371,43 +365,37 @@ gitlab Gemfile
# Generate Fake data # Generate Fake data
gem 'ffaker', '~> 2.10' gem 'ffaker', '~> 2.10'
- gem 'spring', '~> 2.0.0' - gem 'spring', '~> 2.1.0'
- gem 'spring-commands-rspec', '~> 1.0.4' - gem 'spring-commands-rspec', '~> 1.0.4'
+ gem 'spring', '~> 2.0' + gem 'spring', '~> 2.1'
+ gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4' + gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 4.3.0', require: false - gem 'gitlab-styles', '~> 5.1.0', require: false
+ gem 'gitlab-styles', '~> 4.3', require: false + gem 'gitlab-styles', '~> 5.1', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.82.0'
- gem 'rubocop-performance', '~> 1.5.2'
- gem 'rubocop-rspec', '~> 1.37.0'
+ gem 'rubocop', '~> 0.82'
+ gem 'rubocop-performance', '~> 1.5', '>= 1.5.2'
+ gem 'rubocop-rspec', '~> 1.37'
gem 'scss_lint', '~> 0.56.0', require: false gem 'scss_lint', '~> 0.59.0', require: false
gem 'haml_lint', '~> 0.34.0', require: false gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.6.1', require: false gem 'bundler-audit', '~> 0.6.1', require: false
- gem 'benchmark-ips', '~> 2.3.0', require: false - gem 'benchmark-ips', '~> 2.3.0', require: false
+ gem 'benchmark-ips', '~> 2.3', require: false + gem 'benchmark-ips', '~> 2.3', require: false
gem 'knapsack', '~> 1.17' gem 'knapsack', '~> 1.17'
gem 'crystalball', '~> 0.7.0', require: false
- gem 'simple_po_parser', '~> 1.1.2', require: false - gem 'simple_po_parser', '~> 1.1.2', require: false
+ gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false + gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
gem 'timecop', '~> 0.9.1' gem 'timecop', '~> 0.9.1'
@@ -405,18 +405,18 @@ @@ -403,18 +403,18 @@
end end
group :test do group :test do
- gem 'fuubar', '~> 2.2.0' - gem 'fuubar', '~> 2.2.0'
+ gem 'fuubar', '~> 2.2' + gem 'fuubar', '~> 2.2'
gem 'rspec-retry', '~> 0.6.1' gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5' gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false
- gem 'capybara', '~> 3.33.0' - gem 'capybara', '~> 3.33.0'
@ -421,11 +409,11 @@ gitlab Gemfile
- gem 'webmock', '~> 3.9.1' - gem 'webmock', '~> 3.9.1'
+ 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.5', '>= 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'
@@ -435,7 +435,7 @@ @@ -433,7 +433,7 @@
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
@ -434,7 +422,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
@@ -449,8 +449,8 @@ @@ -447,8 +447,8 @@
gem 'health_check', '~> 3.0' gem 'health_check', '~> 3.0'
# System information # System information
@ -445,7 +433,7 @@ gitlab Gemfile
# NTP client # NTP client
gem 'net-ntp' gem 'net-ntp'
@@ -466,13 +466,13 @@ @@ -464,13 +464,13 @@
end end
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
@ -462,7 +450,7 @@ gitlab Gemfile
# Feature toggles # Feature toggles
gem 'flipper', '~> 0.17.1' gem 'flipper', '~> 0.17.1'
@@ -490,12 +490,12 @@ @@ -488,12 +488,12 @@
# Countries list # Countries list
gem 'countries', '~> 3.0' gem 'countries', '~> 3.0'
@ -477,7 +465,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`
@@ -509,12 +509,12 @@ @@ -507,12 +507,12 @@
gem 'valid_email', '~> 0.1' gem 'valid_email', '~> 0.1'
# JSON # JSON

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

@ -7,10 +7,10 @@ Bundler will fail when it can't find these locally
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10' gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2' gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'
-gem 'graphql-docs', '~> 1.6', group: [:development, :test] -gem 'graphql-docs', '~> 1.6', group: [:development, :test]
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
gem 'hashie' gem 'hashie'
# Disable strong_params so that Mash does not respond to :permitted? @@ -318,7 +317,6 @@
@@ -317,7 +316,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,7 +18,7 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 1.4' gem 'batch-loader', '~> 1.4'
@@ -336,19 +334,6 @@ @@ -337,19 +335,6 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
@ -38,24 +38,20 @@ Bundler will fail when it can't find these locally
group :development, :test do group :development, :test do
gem 'bullet', '~> 6.1' gem 'bullet', '~> 6.1'
gem 'pry-byebug', '~> 3.9', platform: :mri gem 'pry-byebug', '~> 3.9', platform: :mri
@@ -369,16 +354,6 @@ @@ -370,12 +355,6 @@
gem 'spring', '~> 2.0' gem 'spring', '~> 2.1'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4' gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 4.3', require: false - gem 'gitlab-styles', '~> 5.1', require: false
- # Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.82'
- gem 'rubocop-performance', '~> 1.5', '>= 1.5.2'
- gem 'rubocop-rspec', '~> 1.37'
- -
- gem 'scss_lint', '~> 0.56.0', require: false - gem 'scss_lint', '~> 0.59.0', require: false
- gem 'haml_lint', '~> 0.34.0', require: false - gem 'haml_lint', '~> 0.36.0', require: false
- gem 'bundler-audit', '~> 0.6.1', require: false - gem 'bundler-audit', '~> 0.6.1', require: false
- -
gem 'benchmark-ips', '~> 2.3', require: false gem 'benchmark-ips', '~> 2.3', require: false
gem 'knapsack', '~> 1.17' gem 'knapsack', '~> 1.17'
@@ -394,16 +369,6 @@ @@ -392,16 +371,6 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
end end

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

@ -2,7 +2,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -334,7 +334,7 @@ @@ -335,7 +335,7 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
@ -11,7 +11,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
gem 'bullet', '~> 6.1' gem 'bullet', '~> 6.1'
gem 'pry-byebug', '~> 3.9', platform: :mri gem 'pry-byebug', '~> 3.9', platform: :mri
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
@@ -367,9 +367,7 @@ @@ -369,9 +369,7 @@
gem 'parallel', '~> 1.19', require: false gem 'parallel', '~> 1.19', require: false
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
@ -20,4 +20,4 @@ Make test dependencies conditional so we can enable them when running autopkgtes
-group :test do -group :test do
gem 'fuubar', '~> 2.2' gem 'fuubar', '~> 2.2'
gem 'rspec-retry', '~> 0.6.1' gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5' gem 'rspec_profiling', '~> 0.0.6'

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

@ -2,7 +2,7 @@ Allow newer versions of httparty to satisfy dependency
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -201,7 +201,7 @@ @@ -202,7 +202,7 @@
gem 'fugit', '~> 1.2', '>= 1.2.1' gem 'fugit', '~> 1.2', '>= 1.2.1'
# HTTP requests # 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 --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -150,7 +150,7 @@ @@ -151,7 +151,7 @@
gem 'commonmarker', '~> 0.20' gem 'commonmarker', '~> 0.20'
gem 'kramdown', '~> 2.3' gem 'kramdown', '~> 2.3'
gem 'RedCloth', '~> 4.3', '>= 4.3.2' 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 --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -145,7 +145,6 @@ @@ -146,7 +146,6 @@
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.12' gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1' 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 --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -174,14 +174,9 @@ @@ -175,14 +175,9 @@
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' 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 --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -134,7 +134,7 @@ @@ -135,7 +135,7 @@
gem 'seed-fu', '~> 2.3', '>= 2.3.7' gem 'seed-fu', '~> 2.3', '>= 2.3.7'
# Search # 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 --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -135,7 +135,7 @@ @@ -136,7 +136,7 @@
# Search # Search
gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model' gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'

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

@ -3,7 +3,7 @@ This gem is used only in gitlab Enterprise Edition
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -51,9 +51,6 @@ @@ -51,9 +51,6 @@
gem 'rack-oauth2', '~> 1.9','>= 1.9.3' gem 'rack-oauth2', '~> 1.16'
gem 'jwt', '~> 2.1' gem 'jwt', '~> 2.1'
-# Kerberos authentication. EE-only -# Kerberos authentication. EE-only
@ -12,7 +12,7 @@ This gem is used only in gitlab Enterprise Edition
# Spam and anti-bot protection # Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0' gem 'akismet', '~> 3.0'
@@ -292,8 +289,6 @@ @@ -290,8 +287,6 @@
gem 'request_store', '~> 1.5' gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'

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 --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -186,7 +186,7 @@ @@ -187,7 +187,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.7'

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

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

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

@ -1,7 +1,7 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -362,7 +362,7 @@ @@ -364,7 +364,7 @@
gem 'rspec_profiling', '~> 0.0.5' gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false
- gem 'capybara', '~> 3.33' - gem 'capybara', '~> 3.33'

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

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

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

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -372,7 +372,6 @@ @@ -374,7 +374,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'

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

@ -3,11 +3,11 @@ rouge update is blocked by
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -153,7 +153,7 @@ @@ -154,7 +154,7 @@
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 'rouge', '~> 3.24' -gem 'rouge', '~> 3.25'
+gem 'rouge', '~> 3.21' +gem 'rouge', '~> 3.21'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2' gem 'bootstrap_form', '~> 4.2'

13
debian/patches/0499-50-relax-rack.patch vendored
View file

@ -1,13 +0,0 @@
3 tests are failing when updating rack to 2.1.4, but CVE patches are backported
--- a/Gemfile
+++ b/Gemfile
@@ -167,7 +167,7 @@
gem 'diff_match_patch', '~> 0.1.0'
# Application server
-gem 'rack', '~> 2.0', '>= 2.1.4'
+gem 'rack', '~> 2.1'
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'

8
debian/patches/0499-60-relax-rugged.patch vendored
View file

@ -6,15 +6,15 @@
-gem 'rugged', '~> 0.28' -gem 'rugged', '~> 0.28'
+gem 'rugged', '~> 1.1' +gem 'rugged', '~> 1.1'
gem 'grape-path-helpers', '~> 1.4' gem 'grape-path-helpers', '~> 1.5'
gem 'faraday', '~> 1.0' gem 'faraday', '~> 1.0'
@@ -259,7 +259,7 @@ @@ -260,7 +260,7 @@
gem 'loofah', '~> 2.2' gem 'loofah', '~> 2.2'
# Working with license # Working with license
-gem 'licensee', '~> 8.9' -gem 'licensee', '~> 8.9'
+gem 'licensee', '~> 9.14' +gem 'licensee', '~> 9.14'
# Ace editor # Detect and convert string character encoding
gem 'ace-rails-ap', '~> 4.1' gem 'charlock_holmes', '~> 0.7.7'

6
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
@@ -160,64 +160,6 @@ @@ -161,64 +161,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": "4.0.0", - "@gitlab/eslint-plugin": "5.0.0",
- "@testing-library/dom": "^7.16.2", - "@testing-library/dom": "^7.16.2",
- "@vue/test-utils": "1.0.0-beta.30", - "@vue/test-utils": "1.0.0-beta.30",
- "acorn": "^6.3.0", - "acorn": "^6.3.0",
@ -47,7 +47,7 @@ These are not required in production
- "karma-mocha-reporter": "^2.2.5", - "karma-mocha-reporter": "^2.2.5",
- "karma-sourcemap-loader": "^0.3.7", - "karma-sourcemap-loader": "^0.3.7",
- "karma-webpack": "^4.0.2", - "karma-webpack": "^4.0.2",
- "markdownlint-cli": "0.23.2", - "markdownlint-cli": "0.24.0",
- "md5": "^2.2.1", - "md5": "^2.2.1",
- "node-sass": "^4.14.1", - "node-sass": "^4.14.1",
- "nodemon": "^2.0.4", - "nodemon": "^2.0.4",

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 --- a/config/webpack.config.js
+++ b/config/webpack.config.js +++ b/config/webpack.config.js
@@ -162,9 +162,14 @@ @@ -164,9 +164,14 @@
resolve: { resolve: {
extensions: ['.js', '.gql', '.graphql'], extensions: ['.js', '.gql', '.graphql'],

4
debian/patches/0620-pid-log-paths.patch vendored
View file

@ -13,7 +13,7 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13415
+ +
get_mail_room_pid() get_mail_room_pid()
{ {
local pid=$(cat $mail_room_pidfile) local pid
--- a/bin/web_unicorn --- a/bin/web_unicorn
+++ b/bin/web_unicorn +++ b/bin/web_unicorn
@@ -7,6 +7,11 @@ @@ -7,6 +7,11 @@
@ -27,7 +27,7 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13415
+ +
get_unicorn_pid() get_unicorn_pid()
{ {
local pid=$(cat $unicorn_pidfile) local pid
--- a/bin/background_jobs_sk --- a/bin/background_jobs_sk
+++ b/bin/background_jobs_sk +++ b/bin/background_jobs_sk
@@ -7,6 +7,11 @@ @@ -7,6 +7,11 @@

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

@ -24,7 +24,7 @@ Use debian packaged node modules when available
const CopyWebpackPlugin = require('copy-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin');
const vendorDllHash = require('./helpers/vendor_dll_hash'); const vendorDllHash = require('./helpers/vendor_dll_hash');
@@ -152,6 +151,8 @@ @@ -154,6 +153,8 @@
entry: generateEntries, entry: generateEntries,
@ -33,7 +33,7 @@ Use debian packaged node modules when available
output: { output: {
path: path.join(ROOT_PATH, 'public/assets/webpack'), path: path.join(ROOT_PATH, 'public/assets/webpack'),
publicPath: '/assets/webpack/', publicPath: '/assets/webpack/',
@@ -161,13 +162,13 @@ @@ -163,13 +164,13 @@
}, },
resolve: { resolve: {
@ -50,7 +50,7 @@ Use debian packaged node modules when available
}, },
module: { module: {
@@ -180,9 +181,13 @@ @@ -182,9 +183,13 @@
}, },
{ {
test: /\.js$/, test: /\.js$/,
@ -65,7 +65,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'),
@@ -526,19 +531,6 @@ @@ -528,19 +533,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(),
@ -85,7 +85,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),
@@ -574,6 +566,7 @@ @@ -572,6 +564,7 @@
node: { node: {
fs: 'empty', // sqljs requires fs fs: 'empty', // sqljs requires fs
@ -95,7 +95,7 @@ Use debian packaged node modules when available
}; };
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -35,12 +35,6 @@ @@ -36,12 +36,6 @@
"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": {
@ -106,9 +106,9 @@ Use debian packaged node modules when available
- "@babel/plugin-syntax-import-meta": "^7.10.1", - "@babel/plugin-syntax-import-meta": "^7.10.1",
- "@babel/preset-env": "^7.10.1", - "@babel/preset-env": "^7.10.1",
"@gitlab/at.js": "1.5.5", "@gitlab/at.js": "1.5.5",
"@gitlab/svgs": "1.171.0", "@gitlab/svgs": "1.175.0",
"@gitlab/ui": "21.33.0", "@gitlab/ui": "23.9.0",
@@ -55,29 +49,27 @@ @@ -56,29 +50,27 @@
"apollo-link": "^1.2.14", "apollo-link": "^1.2.14",
"apollo-link-batch-http": "^1.2.14", "apollo-link-batch-http": "^1.2.14",
"apollo-upload-client": "^13.0.0", "apollo-upload-client": "^13.0.0",
@ -152,8 +152,8 @@ Use debian packaged node modules when available
+ "deckar01-task_list": "link:/usr/share/nodejs/deckar01-task_list", + "deckar01-task_list": "link:/usr/share/nodejs/deckar01-task_list",
"diff": "^3.4.0", "diff": "^3.4.0",
"document-register-element": "1.14.3", "document-register-element": "1.14.3",
"dompurify": "^2.1.1", "dompurify": "^2.2.2",
@@ -85,79 +77,80 @@ @@ -86,79 +78,82 @@
"editorconfig": "^0.15.3", "editorconfig": "^0.15.3",
"emoji-regex": "^7.0.3", "emoji-regex": "^7.0.3",
"emoji-unicode-version": "^0.2.1", "emoji-unicode-version": "^0.2.1",
@ -166,8 +166,8 @@ Use debian packaged node modules when available
"fuzzaldrin-plus": "^0.6.0", "fuzzaldrin-plus": "^0.6.0",
- "glob": "^7.1.6", - "glob": "^7.1.6",
+ "glob": "link:/usr/share/nodejs/glob", + "glob": "link:/usr/share/nodejs/glob",
"graphql": "^14.7.0", "graphql": "^15.4.0",
"graphql-tag": "^2.10.1", "graphql-tag": "^2.11.0",
"immer": "^7.0.7", "immer": "^7.0.7",
- "imports-loader": "^0.8.0", - "imports-loader": "^0.8.0",
+ "imports-loader": "link:/usr/share/nodejs/imports-loader", + "imports-loader": "link:/usr/share/nodejs/imports-loader",
@ -201,7 +201,7 @@ Use debian packaged node modules when available
"mock-apollo-client": "^0.4.0", "mock-apollo-client": "^0.4.0",
"monaco-editor": "^0.20.0", "monaco-editor": "^0.20.0",
"monaco-editor-webpack-plugin": "^1.9.0", "monaco-editor-webpack-plugin": "^1.9.0",
"monaco-yaml": "^2.4.1", "monaco-yaml": "^2.5.1",
- "mousetrap": "1.6.5", - "mousetrap": "1.6.5",
- "pdfjs-dist": "^2.0.943", - "pdfjs-dist": "^2.0.943",
+ "mousetrap": "link:/usr/share/nodejs/mousetrap", + "mousetrap": "link:/usr/share/nodejs/mousetrap",
@ -254,9 +254,9 @@ Use debian packaged node modules when available
"vuedraggable": "^2.23.0", "vuedraggable": "^2.23.0",
"vuex": "^3.5.1", "vuex": "^3.5.1",
"web-vitals": "^0.2.4", "web-vitals": "^0.2.4",
- "webpack": "^4.42.0", "webpack": "^4.42.0",
- "webpack-bundle-analyzer": "^3.6.0", - "webpack-bundle-analyzer": "^3.6.0",
- "webpack-cli": "^3.3.11", "webpack-cli": "^3.3.11",
- "webpack-stats-plugin": "^0.3.1", - "webpack-stats-plugin": "^0.3.1",
- "worker-loader": "^2.0.0", - "worker-loader": "^2.0.0",
- "xterm": "3.14.5" - "xterm": "3.14.5"
@ -297,7 +297,7 @@ Use debian packaged node modules when available
--- a/config/application.rb --- a/config/application.rb
+++ b/config/application.rb +++ b/config/application.rb
@@ -218,7 +218,7 @@ @@ -225,7 +225,7 @@
config.assets.precompile << "illustrations/*.svg" config.assets.precompile << "illustrations/*.svg"
# Import Fontawesome fonts # Import Fontawesome fonts

10
debian/patches/0770-remove-rubocop-rspec.patch vendored
View file

@ -1,10 +0,0 @@
--- a/spec/support/rspec.rb
+++ b/spec/support/rspec.rb
@@ -5,7 +5,6 @@
require_relative "helpers/stub_object_storage"
require_relative "helpers/stub_env"
require_relative "helpers/fast_rails_root"
-require 'rubocop/rspec/support'
RSpec.configure do |config|
config.mock_with :rspec

2
debian/patches/0780-css-loader-3.patch vendored
View file

@ -11,7 +11,7 @@ Subject: [PATCH] Update css-loader node module 2.1.1 -> 3.2.1
--- a/config/webpack.config.js --- a/config/webpack.config.js
+++ b/config/webpack.config.js +++ b/config/webpack.config.js
@@ -256,8 +256,10 @@ @@ -258,8 +258,10 @@
{ {
loader: 'css-loader', loader: 'css-loader',
options: { options: {

2
debian/patches/0790-worker-loader-3.patch vendored
View file

@ -11,7 +11,7 @@ Subject: [PATCH] Update worker-loader from 2.x to 3.x
--- a/config/webpack.config.js --- a/config/webpack.config.js
+++ b/config/webpack.config.js +++ b/config/webpack.config.js
@@ -234,8 +234,8 @@ @@ -236,8 +236,8 @@
{ {
loader: 'worker-loader', loader: 'worker-loader',
options: { options: {

2
debian/patches/series vendored
View file

@ -15,7 +15,6 @@
0499-20-remove-capybara-screenshot.patch 0499-20-remove-capybara-screenshot.patch
0499-30-remove-guard-rspec.patch 0499-30-remove-guard-rspec.patch
0499-40-relax-rouge.patch 0499-40-relax-rouge.patch
0499-50-relax-rack.patch
0499-60-relax-rugged.patch 0499-60-relax-rugged.patch
0500-set-webpack-root.patch 0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch 0510-remove-dev-dependencies.patch
@ -29,7 +28,6 @@
0710-use-yarnpkg.patch 0710-use-yarnpkg.patch
0740-use-packaged-modules.patch 0740-use-packaged-modules.patch
0750-fix-relative-paths.patch 0750-fix-relative-paths.patch
0770-remove-rubocop-rspec.patch
0770-remove-capybara-screenshot-rspec.patch 0770-remove-capybara-screenshot-rspec.patch
0780-css-loader-3.patch 0780-css-loader-3.patch
0790-worker-loader-3.patch 0790-worker-loader-3.patch