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 2020-07-29 00:16:15 +05:30
parent 9c63f7bcc8
commit 47d16f1c2d
19 changed files with 101 additions and 2481 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ gitlab Gemfile
# Supported DBs # Supported DBs
gem 'pg', '~> 1.1' gem 'pg', '~> 1.1'
@@ -22,31 +22,31 @@ @@ -22,31 +22,31 @@
gem 'grape-path-helpers', '~> 1.2' gem 'grape-path-helpers', '~> 1.3'
gem 'faraday', '~> 0.12' gem 'faraday', '~> 0.12'
-gem 'marginalia', '~> 1.8.0' -gem 'marginalia', '~> 1.8.0'
@ -69,7 +69,7 @@ gitlab Gemfile
# Kerberos authentication. EE-only # Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos gem 'gssapi', group: :kerberos
@@ -57,42 +57,42 @@ @@ -57,14 +57,14 @@
gem 'invisible_captcha', '~> 0.12.1' gem 'invisible_captcha', '~> 0.12.1'
# Two-factor authentication # Two-factor authentication
@ -86,10 +86,9 @@ gitlab Gemfile
+gem 'validates_hostname', '~> 1.0', '>= 1.0.10' +gem 'validates_hostname', '~> 1.0', '>= 1.0.10'
+gem 'rubyzip', '~> 2.0', require: 'zip' +gem 'rubyzip', '~> 2.0', require: 'zip'
# GitLab Pages letsencrypt support # GitLab Pages letsencrypt support
-gem 'acme-client', '~> 2.0.5' gem 'acme-client', '~> 2.0', '>= 2.0.6'
+gem 'acme-client', '~> 2.0', '>= 2.0.5'
# Browser detection @@ -72,12 +72,12 @@
gem 'browser', '~> 2.5' gem 'browser', '~> 2.5'
# GPG # GPG
@ -104,8 +103,9 @@ gitlab Gemfile
gem 'net-ldap' gem 'net-ldap'
# API # API
-gem 'grape', '~> 1.1.0' @@ -85,16 +85,16 @@
+gem 'grape', '~> 1.1' # Remove config/initializers/grape_patch.rb
gem 'grape', '= 1.4.0'
gem 'grape-entity', '~> 0.7.1' gem 'grape-entity', '~> 0.7.1'
-gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' -gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
+gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors' +gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
@ -124,7 +124,7 @@ gitlab Gemfile
# Disable strong_params so that Mash does not respond to :permitted? # Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes' gem 'hashie-forbidden_attributes'
@@ -101,7 +101,7 @@ @@ -103,7 +103,7 @@
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
@ -133,7 +133,7 @@ gitlab Gemfile
# Files attachments # Files attachments
gem 'carrierwave', '~> 1.3' gem 'carrierwave', '~> 1.3'
@@ -111,7 +111,7 @@ @@ -113,7 +113,7 @@
gem 'fog-aws', '~> 3.5' gem 'fog-aws', '~> 3.5'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb. # Also see config/initializers/fog_core_patch.rb.
@ -142,7 +142,7 @@ gitlab Gemfile
gem 'fog-google', '~> 1.10' gem 'fog-google', '~> 1.10'
gem 'fog-local', '~> 0.6' gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0' gem 'fog-openstack', '~> 1.0'
@@ -125,7 +125,7 @@ @@ -127,7 +127,7 @@
gem 'unf', '~> 0.1.4' gem 'unf', '~> 0.1.4'
# Seed data # Seed data
@ -151,7 +151,7 @@ gitlab Gemfile
# Search # Search
gem 'elasticsearch-model', '~> 6.1' gem 'elasticsearch-model', '~> 6.1'
@@ -136,22 +136,22 @@ @@ -138,23 +138,23 @@
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.12' gem 'html-pipeline', '~> 2.12'
@ -162,8 +162,10 @@ gitlab Gemfile
+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.20' gem 'commonmarker', '~> 0.20'
-gem 'kramdown', '~> 2.2.1'
-gem 'RedCloth', '~> 4.3.2' -gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~> 6.1.2' -gem 'rdoc', '~> 6.1.2'
+gem 'kramdown', '~> 2.2', '>= 2.2.1'
+gem 'RedCloth', '~> 4.3', '>= 4.3.2' +gem 'RedCloth', '~> 4.3', '>= 4.3.2'
+gem 'rdoc', '~> 6.1', '>= 6.1.2' +gem 'rdoc', '~> 6.1', '>= 6.1.2'
gem 'org-ruby', '~> 0.9.12' gem 'org-ruby', '~> 0.9.12'
@ -173,8 +175,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.19.0' -gem 'rouge', '~> 3.21.0'
+gem 'rouge', '~> 3.19' +gem 'rouge', '~> 3.21'
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'
@ -183,16 +185,16 @@ gitlab Gemfile
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
# Calendar rendering # Calendar rendering
@@ -162,7 +162,7 @@ @@ -165,7 +165,7 @@
gem 'diff_match_patch', '~> 0.1.0' gem 'diff_match_patch', '~> 0.1.0'
# Application server # Application server
-gem 'rack', '~> 2.0.9' -gem 'rack', '~> 2.0.9'
+gem 'rack', '~> 2.0', '>= 2.0.9' +gem 'rack', '~> 2.0', '>= 2.0.9'
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
group :unicorn do @@ -186,13 +186,13 @@
gem 'unicorn', '~> 5.5'
@@ -182,13 +182,13 @@
gem 'acts-as-taggable-on', '~> 6.0' gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs # Background jobs
@ -209,7 +211,7 @@ gitlab Gemfile
# HTTP requests # HTTP requests
gem 'httparty', '~> 0.16.4' gem 'httparty', '~> 0.16.4'
@@ -200,14 +200,14 @@ @@ -204,14 +204,14 @@
gem 'ruby-progressbar' gem 'ruby-progressbar'
# GitLab settings # GitLab settings
@ -227,7 +229,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript # Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1' gem 'js_regex', '~> 3.1'
@@ -220,13 +220,13 @@ @@ -224,23 +224,23 @@
gem 'connection_pool', '~> 2.0' gem 'connection_pool', '~> 2.0'
# Redis session store # Redis session store
@ -242,8 +244,11 @@ gitlab Gemfile
+gem 'hipchat', '~> 1.5' +gem 'hipchat', '~> 1.5'
# Jira integration # Jira integration
gem 'jira-ruby', '~> 2.0.0' -gem 'jira-ruby', '~> 2.0.0'
@@ -236,7 +236,7 @@ +gem 'jira-ruby', '~> 2.0'
gem 'atlassian-jwt', '~> 0.2.0'
# Flowdock integration
gem 'flowdock', '~> 0.7' gem 'flowdock', '~> 0.7'
# Slack integration # Slack integration
@ -252,7 +257,7 @@ gitlab Gemfile
# Hangouts Chat integration # Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5' gem 'hangouts-chat', '~> 0.0.5'
@@ -248,11 +248,11 @@ @@ -254,11 +254,11 @@
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration # Kubernetes integration
@ -266,7 +271,7 @@ gitlab Gemfile
# Sanitizes SVG input # Sanitizes SVG input
gem 'loofah', '~> 2.2' gem 'loofah', '~> 2.2'
@@ -261,7 +261,7 @@ @@ -267,7 +267,7 @@
gem 'licensee', '~> 8.9' gem 'licensee', '~> 8.9'
# Ace editor # Ace editor
@ -275,7 +280,7 @@ gitlab Gemfile
# Detect and convert string character encoding # Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5' gem 'charlock_holmes', '~> 0.7.5'
@@ -279,8 +279,8 @@ @@ -285,8 +285,8 @@
gem 'webpack-rails', '~> 0.9.10' gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0' gem 'rack-proxy', '~> 0.6.0'
@ -286,7 +291,7 @@ gitlab Gemfile
gem 'addressable', '~> 2.7' gem 'addressable', '~> 2.7'
gem 'font-awesome-rails', '~> 4.7' gem 'font-awesome-rails', '~> 4.7'
@@ -292,24 +292,24 @@ @@ -298,24 +298,24 @@
gem "gitlab-license", "~> 1.0" gem "gitlab-license", "~> 1.0"
# Protect against bruteforcing # Protect against bruteforcing
@ -300,8 +305,8 @@ gitlab Gemfile
+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.0' -gem 'gitlab-labkit', '0.12.1'
+gem 'gitlab-labkit', '~> 0.12.0' +gem 'gitlab-labkit', '~> 0.12.1'
# I18n # I18n
gem 'ruby_parser', '~> 3.8', require: false gem 'ruby_parser', '~> 3.8', require: false
@ -317,7 +322,7 @@ gitlab Gemfile
# Perf bar # Perf bar
gem 'peek', '~> 1.1' gem 'peek', '~> 1.1'
@@ -343,40 +343,40 @@ @@ -348,29 +348,29 @@
group :development, :test do group :development, :test do
gem 'bullet', '~> 6.0.2' gem 'bullet', '~> 6.0.2'
@ -346,8 +351,8 @@ gitlab Gemfile
+ gem 'spring', '~> 2.0' + gem 'spring', '~> 2.0'
+ gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4' + gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 4.2.0', require: false - gem 'gitlab-styles', '~> 4.3.0', require: false
+ gem 'gitlab-styles', '~> 4.2', require: false + gem 'gitlab-styles', '~> 4.3', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines # Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.82.0' - gem 'rubocop', '~> 0.82.0'
- gem 'rubocop-performance', '~> 1.5.2' - gem 'rubocop-performance', '~> 1.5.2'
@ -358,7 +363,8 @@ gitlab Gemfile
gem 'scss_lint', '~> 0.56.0', require: false gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.34.0', require: false gem 'haml_lint', '~> 0.34.0', require: false
gem 'simplecov', '~> 0.18.5', require: false @@ -378,11 +378,11 @@
gem 'simplecov-cobertura', '~> 1.3.1', 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
@ -371,7 +377,7 @@ gitlab Gemfile
gem 'timecop', '~> 0.9.1' gem 'timecop', '~> 0.9.1'
@@ -391,18 +391,18 @@ @@ -399,18 +399,18 @@
end end
group :test do group :test do
@ -396,7 +402,7 @@ gitlab Gemfile
gem 'rails-controller-testing' gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1' gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.10.0' gem 'test-prof', '~> 0.10.0'
@@ -421,7 +421,7 @@ @@ -429,7 +429,7 @@
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
@ -405,7 +411,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
@@ -432,11 +432,11 @@ @@ -440,11 +440,11 @@
gem 'oauth2', '~> 1.4' gem 'oauth2', '~> 1.4'
# Health check # Health check
@ -420,12 +426,12 @@ gitlab Gemfile
# NTP client # NTP client
gem 'net-ntp' gem 'net-ntp'
@@ -452,13 +452,13 @@ @@ -460,13 +460,13 @@
end end
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.1.0.pre.rc1' -gem 'gitaly', '~> 13.2.0.pre.rc2'
+gem 'gitaly', '~> 13.1' +gem 'gitaly', '~> 13.2'
-gem 'grpc', '~> 1.24.0' -gem 'grpc', '~> 1.24.0'
+gem 'grpc', '~> 1.24' +gem 'grpc', '~> 1.24'
@ -438,7 +444,7 @@ gitlab Gemfile
# Feature toggles # Feature toggles
gem 'flipper', '~> 0.17.1' gem 'flipper', '~> 0.17.1'
@@ -476,12 +476,12 @@ @@ -484,12 +484,12 @@
# Countries list # Countries list
gem 'countries', '~> 3.0' gem 'countries', '~> 3.0'
@ -453,11 +459,15 @@ 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`
@@ -495,5 +495,5 @@ @@ -503,7 +503,7 @@
gem 'valid_email', '~> 0.1' gem 'valid_email', '~> 0.1'
# JSON # JSON
-gem 'json', '~> 2.3.0' -gem 'json', '~> 2.3.0'
-gem 'json-schema', '~> 2.8.0' -gem 'json-schema', '~> 2.8.0'
-gem 'oj', '~> 3.10.6'
-gem 'multi_json', '~> 1.14.1'
+gem 'json', '~> 2.3' +gem 'json', '~> 2.3'
+gem 'json-schema', '~> 2.8' +gem 'json-schema', '~> 2.8'
+gem 'oj', '~> 3.10', '>= 3.10.6'
+gem 'multi_json', '~> 1.14', '>= 1.14.1'

18
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 --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -92,7 +92,6 @@ @@ -94,7 +94,6 @@
# https://gitlab.com/gitlab-org/gitlab/issues/31747 # https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10' gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
gem 'apollo_upload_server', '~> 2.0.0.beta3' gem 'apollo_upload_server', '~> 2.0.0.beta3'
@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
# Disable strong_params so that Mash does not respond to :permitted? # Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes' gem 'hashie-forbidden_attributes'
@@ -307,7 +306,6 @@ @@ -313,7 +312,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'
@@ -326,21 +324,6 @@ @@ -332,20 +330,6 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
@ -27,10 +27,9 @@ Bundler will fail when it can't find these locally
- gem 'danger', '~> 6.0', require: false - gem 'danger', '~> 6.0', require: false
- -
- gem 'letter_opener_web', '~> 1.3.4' - gem 'letter_opener_web', '~> 1.3.4'
- gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
- -
- # Better errors handler - # Better errors handler
- gem 'better_errors', '~> 2.5.0' - gem 'better_errors', '~> 2.7.1'
- gem 'binding_of_caller', '~> 0.8.0' - gem 'binding_of_caller', '~> 0.8.0'
- -
- # thin instead webrick - # thin instead webrick
@ -40,11 +39,11 @@ Bundler will fail when it can't find these locally
group :development, :test do group :development, :test do
gem 'bullet', '~> 6.0.2' gem 'bullet', '~> 6.0.2'
gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri
@@ -361,17 +344,6 @@ @@ -366,18 +350,6 @@
gem 'spring', '~> 2.0' gem 'spring', '~> 2.0'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4' gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 4.2', require: false - gem 'gitlab-styles', '~> 4.3', require: false
- # Pin these dependencies, otherwise a new rule could break the CI pipelines - # Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.82' - gem 'rubocop', '~> 0.82'
- gem 'rubocop-performance', '~> 1.5', '>= 1.5.2' - gem 'rubocop-performance', '~> 1.5', '>= 1.5.2'
@ -53,13 +52,14 @@ Bundler will fail when it can't find these locally
- gem 'scss_lint', '~> 0.56.0', require: false - gem 'scss_lint', '~> 0.56.0', require: false
- gem 'haml_lint', '~> 0.34.0', require: false - gem 'haml_lint', '~> 0.34.0', require: false
- gem 'simplecov', '~> 0.18.5', require: false - gem 'simplecov', '~> 0.18.5', require: false
- gem 'simplecov-cobertura', '~> 1.3.1', 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'
@@ -385,11 +357,6 @@ @@ -393,11 +365,6 @@
gem 'parallel', '~> 1.19', require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
end end
-# Gems required in omnibus-gitlab pipeline -# Gems required in omnibus-gitlab pipeline

10
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
@@ -324,7 +324,7 @@ @@ -330,7 +330,7 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
@ -11,12 +11,12 @@ Make test dependencies conditional so we can enable them when running autopkgtes
gem 'bullet', '~> 6.0.2' gem 'bullet', '~> 6.0.2'
gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
@@ -355,9 +355,6 @@ @@ -363,9 +363,7 @@
gem 'png_quantizator', '~> 0.2.1', require: false
gem 'parallel', '~> 1.19', require: false gem 'parallel', '~> 1.19', require: false
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
-end -end
-
-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'

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
@@ -190,7 +190,7 @@ @@ -194,7 +194,7 @@
gem 'fugit', '~> 1.2', '>= 1.2.1' gem 'fugit', '~> 1.2', '>= 1.2.1'
# HTTP requests # HTTP requests

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

@ -2,7 +2,7 @@ Allow newer version to satisfy requirement
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -317,7 +317,7 @@ @@ -323,7 +323,7 @@
# Metrics # Metrics
group :metrics do group :metrics do

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

@ -2,9 +2,9 @@ Allow rdoc from ruby 2.5 to match requirement
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -140,7 +140,7 @@ @@ -143,7 +143,7 @@
gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.20' gem 'commonmarker', '~> 0.20'
gem 'kramdown', '~> 2.2', '>= 2.2.1'
gem 'RedCloth', '~> 4.3', '>= 4.3.2' gem 'RedCloth', '~> 4.3', '>= 4.3.2'
-gem 'rdoc', '~> 6.1', '>= 6.1.2' -gem 'rdoc', '~> 6.1', '>= 6.1.2'
+gem 'rdoc', '~> 6.0' +gem 'rdoc', '~> 6.0'

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

@ -4,11 +4,11 @@ maintaining two almost same packages.
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -136,7 +136,6 @@ @@ -138,7 +138,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'
-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.20' gem 'commonmarker', '~> 0.20'
gem 'RedCloth', '~> 4.3', '>= 4.3.2' gem 'kramdown', '~> 2.2', '>= 2.2.1'

10
debian/patches/0440-remove-puma.patch vendored
View file

@ -2,21 +2,13 @@ We are using unicorn so don't need puma
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -161,18 +161,13 @@ @@ -172,11 +172,6 @@
# Application server
gem 'rack', '~> 2.0', '>= 2.0.9'
+gem 'rack-timeout', require: false
group :unicorn do
gem 'unicorn', '~> 5.5'
gem 'unicorn-worker-killer', '~> 0.4.4' gem 'unicorn-worker-killer', '~> 0.4.4'
end end
-group :puma do -group :puma do
- gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false - gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
- gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false - gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
- gem 'rack-timeout', require: false
-end -end
- -
# State machine # State machine

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
@@ -127,7 +127,7 @@ @@ -129,7 +129,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
@@ -128,7 +128,7 @@ @@ -130,7 +130,7 @@
# Search # Search
gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model' gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'

2
debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch vendored
View file

@ -5,7 +5,7 @@ Bug: https://gitlab.com/gitlab-org/gitlab/-/issues/37931
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -131,7 +131,7 @@ @@ -133,7 +133,7 @@
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' gem 'elasticsearch-api', '~> 6.8'
gem 'aws-sdk' gem 'aws-sdk'

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

@ -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'
@@ -282,8 +279,6 @@ @@ -288,8 +285,6 @@
gem 'request_store', '~> 1.5' gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'

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

@ -2,10 +2,10 @@ Debian already has 0.8
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -79,7 +79,7 @@ @@ -81,7 +81,7 @@
# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged
# API # Remove config/initializers/grape_patch.rb
gem 'grape', '~> 1.1' gem 'grape', '= 1.4.0'
-gem 'grape-entity', '~> 0.7.1' -gem 'grape-entity', '~> 0.7.1'
+gem 'grape-entity', '~> 0.8' +gem 'grape-entity', '~> 0.8'
gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors' gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'

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

@ -2,14 +2,15 @@ These are not required in production
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -155,66 +155,7 @@ @@ -156,66 +156,7 @@
"xterm": "3.14.5" "xterm": "3.14.5"
}, },
"devDependencies": { "devDependencies": {
- "acorn": "^6.3.0",
- "@babel/plugin-transform-modules-commonjs": "^7.10.1", - "@babel/plugin-transform-modules-commonjs": "^7.10.1",
- "@gitlab/eslint-plugin": "3.1.0", - "@gitlab/eslint-plugin": "3.1.0",
- "@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",
- "axios-mock-adapter": "^1.15.0", - "axios-mock-adapter": "^1.15.0",
- "babel-jest": "^24.1.0", - "babel-jest": "^24.1.0",
- "babel-plugin-dynamic-import-node": "^2.2.0", - "babel-plugin-dynamic-import-node": "^2.2.0",
@ -26,7 +27,6 @@ These are not required in production
- "eslint-plugin-no-jquery": "^2.3.0", - "eslint-plugin-no-jquery": "^2.3.0",
- "gettext-extractor": "^3.4.3", - "gettext-extractor": "^3.4.3",
- "gettext-extractor-vue": "^4.0.2", - "gettext-extractor-vue": "^4.0.2",
- "graphql-tag": "^2.10.1",
- "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-coverage": "^3.0.0",
- "istanbul-lib-report": "^3.0.0", - "istanbul-lib-report": "^3.0.0",
- "istanbul-reports": "^3.0.0", - "istanbul-reports": "^3.0.0",
@ -68,5 +68,5 @@ These are not required in production
- }, - },
+ }, + },
"blockedDependencies": { "blockedDependencies": {
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.md#bootstrapvue" "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
}, },

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

@ -9,7 +9,7 @@ Use debian packaged node modules when available
@@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin; const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
const CompressionPlugin = require('compression-webpack-plugin'); const CompressionPlugin = require('compression-webpack-plugin');
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin'); const MonacoWebpackPlugin = require('./plugins/monaco_webpack');
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; -const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
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');
@ -76,7 +76,7 @@ Use debian packaged node modules when available
}; };
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -33,12 +33,6 @@ @@ -35,12 +35,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": {
@ -87,9 +87,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.140.0", "@gitlab/svgs": "1.152.0",
"@gitlab/ui": "17.0.1", "@gitlab/ui": "17.33.0",
@@ -53,54 +47,28 @@ @@ -55,55 +49,29 @@
"apollo-link": "^1.2.11", "apollo-link": "^1.2.11",
"apollo-link-batch-http": "^1.2.11", "apollo-link-batch-http": "^1.2.11",
"apollo-upload-client": "^10.0.0", "apollo-upload-client": "^10.0.0",
@ -101,7 +101,6 @@ Use debian packaged node modules when available
"bootstrap": "4.4.1", "bootstrap": "4.4.1",
- "brace-expansion": "^1.1.8", - "brace-expansion": "^1.1.8",
- "cache-loader": "^4.1.0", - "cache-loader": "^4.1.0",
"classlist-polyfill": "^1.2.0",
- "clipboard": "^1.7.1", - "clipboard": "^1.7.1",
- "codemirror": "^5.48.4", - "codemirror": "^5.48.4",
"codesandbox-api": "0.0.23", "codesandbox-api": "0.0.23",
@ -124,12 +123,13 @@ Use debian packaged node modules when available
"emoji-unicode-version": "^0.2.1", "emoji-unicode-version": "^0.2.1",
- "exports-loader": "^0.7.0", - "exports-loader": "^0.7.0",
"file-loader": "^5.1.0", "file-loader": "^5.1.0",
"formdata-polyfill": "^3.0.19",
"fuzzaldrin-plus": "^0.6.0", "fuzzaldrin-plus": "^0.6.0",
- "glob": "^7.1.6", - "glob": "^7.1.6",
"graphql": "^14.0.2", "graphql": "^14.0.2",
"graphql-tag": "^2.10.1",
"immer": "^5.2.1", "immer": "^5.2.1",
- "imports-loader": "^0.8.0", - "imports-loader": "^0.8.0",
"ipaddr.js": "^1.9.1",
- "jed": "^1.1.1", - "jed": "^1.1.1",
"jest-transform-graphql": "^2.1.0", "jest-transform-graphql": "^2.1.0",
- "jquery": "^3.4.1", - "jquery": "^3.4.1",
@ -137,6 +137,7 @@ Use debian packaged node modules when available
"jquery.caret": "^0.3.1", "jquery.caret": "^0.3.1",
"jquery.waitforimages": "^2.2.0", "jquery.waitforimages": "^2.2.0",
- "js-cookie": "^2.2.1", - "js-cookie": "^2.2.1",
"js-yaml": "^3.13.1",
- "jszip": "^3.1.3", - "jszip": "^3.1.3",
- "jszip-utils": "^0.0.2", - "jszip-utils": "^0.0.2",
"katex": "^0.10.0", "katex": "^0.10.0",
@ -144,10 +145,10 @@ Use debian packaged node modules when available
"marked": "^0.3.12", "marked": "^0.3.12",
"mermaid": "^8.5.2", "mermaid": "^8.5.2",
"mersenne-twister": "1.1.0", "mersenne-twister": "1.1.0",
@@ -108,13 +76,9 @@ @@ -111,13 +79,9 @@
"mitt": "^1.2.0", "monaco-editor": "^0.20.0",
"monaco-editor": "^0.18.1", "monaco-editor-webpack-plugin": "^1.9.0",
"monaco-editor-webpack-plugin": "^1.7.0", "monaco-yaml": "^2.4.0",
- "mousetrap": "^1.4.6", - "mousetrap": "^1.4.6",
"pdfjs-dist": "^2.0.943", "pdfjs-dist": "^2.0.943",
"pikaday": "^1.8.0", "pikaday": "^1.8.0",
@ -158,8 +159,8 @@ Use debian packaged node modules when available
"raphael": "^2.2.7", "raphael": "^2.2.7",
"raw-loader": "^4.0.0", "raw-loader": "^4.0.0",
"sanitize-html": "^1.22.0", "sanitize-html": "^1.22.0",
@@ -128,31 +92,21 @@ @@ -130,30 +94,20 @@
"svg4everybody": "2.1.9", "style-loader": "^1.1.3",
"swagger-ui-dist": "^3.26.2", "swagger-ui-dist": "^3.26.2",
"three": "^0.84.0", "three": "^0.84.0",
- "three-orbit-controls": "^82.1.0", - "three-orbit-controls": "^82.1.0",
@ -168,8 +169,7 @@ Use debian packaged node modules when available
"tiptap": "^1.8.0", "tiptap": "^1.8.0",
"tiptap-commands": "^1.4.0", "tiptap-commands": "^1.4.0",
"tiptap-extensions": "^1.8.0", "tiptap-extensions": "^1.8.0",
"tributejs": "4.1.3", "tributejs": "5.1.3",
"unfetch": "^4.1.0",
- "url-loader": "^3.0.0", - "url-loader": "^3.0.0",
"uuid": "8.1.0", "uuid": "8.1.0",
"visibilityjs": "^1.2.4", "visibilityjs": "^1.2.4",

12
debian/patches/0741-add-graphql-tag.patch vendored
View file

@ -1,12 +0,0 @@
yarn fails to install graphql-tag
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
"formdata-polyfill": "^3.0.19",
"fuzzaldrin-plus": "^0.6.0",
"graphql": "^14.0.2",
+ "graphql-tag": "^2.10.0",
"immer": "^5.2.1",
"jest-transform-graphql": "^2.1.0",
"jquery.caret": "^0.3.1",

2368
debian/patches/0760-update-grape.patch vendored
View file

File diff suppressed because it is too large Load diff

4
debian/patches/0790-protobuf-compat.patch vendored
View file

@ -15,6 +15,6 @@ Subject: [PATCH 2/2] Fix protobuf compatibility (Thanks to Stan Hu)
{ {
- repository: repository.gitaly_repository, - repository: repository.gitaly_repository,
+ repository: repository.gitaly_repository.to_h, + repository: repository.gitaly_repository.to_h,
address: Gitlab::GitalyClient.address(container.repository_storage), address: Gitlab::GitalyClient.address(repository.shard),
token: Gitlab::GitalyClient.token(container.repository_storage), token: Gitlab::GitalyClient.token(repository.shard),
features: Feature::Gitaly.server_feature_flags features: Feature::Gitaly.server_feature_flags

2
debian/patches/series vendored
View file

@ -22,7 +22,5 @@
0700-add-salsa-link-to-help.patch 0700-add-salsa-link-to-help.patch
0710-use-yarnpkg.patch 0710-use-yarnpkg.patch
0740-use-packaged-modules.patch 0740-use-packaged-modules.patch
0741-add-graphql-tag.patch
0750-fix-relative-paths.patch 0750-fix-relative-paths.patch
0760-update-grape.patch
0790-protobuf-compat.patch 0790-protobuf-compat.patch