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 2020-11-24 16:42:00 +05:30
parent b2b023cf11
commit 785641d6a9
19 changed files with 99 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,19 +25,18 @@ gitlab Gemfile
# Supported DBs # Supported DBs
gem 'pg', '~> 1.1' gem 'pg', '~> 1.1'
@@ -22,31 +22,31 @@ @@ -22,32 +22,32 @@
gem 'grape-path-helpers', '~> 1.3' gem 'grape-path-helpers', '~> 1.3'
gem 'faraday', '~> 0.12' gem 'faraday', '~> 1.0'
-gem 'marginalia', '~> 1.8.0' -gem 'marginalia', '~> 1.9.0'
+gem 'marginalia', '~> 1.8' +gem 'marginalia', '~> 1.9'
# Authentication libraries # Authentication libraries
gem 'devise', '~> 4.6' gem 'devise', '~> 4.6'
-gem 'doorkeeper', '~> 5.0.3' -gem 'doorkeeper', '~> 5.3.0'
-gem 'doorkeeper-openid_connect', '~> 1.6.3' +gem 'doorkeeper', '~> 5.3'
+gem 'doorkeeper', '~> 5.0', '>= 5.0.3' gem 'doorkeeper-openid_connect', '~> 1.7.4'
+gem 'doorkeeper-openid_connect', '~> 1.6', '>= 1.6.3'
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'
@ -61,15 +60,16 @@ gitlab Gemfile
gem 'omniauth-authentiq', '~> 0.3.3' gem 'omniauth-authentiq', '~> 0.3.3'
gem 'omniauth_openid_connect', '~> 0.3.5' gem 'omniauth_openid_connect', '~> 0.3.5'
-gem 'omniauth-salesforce', '~> 1.0.5' -gem 'omniauth-salesforce', '~> 1.0.5'
+gem 'omniauth-salesforce', '~> 1.0', '>= 1.0.5'
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
-gem 'rack-oauth2', '~> 1.9.3' -gem 'rack-oauth2', '~> 1.9.3'
-gem 'jwt', '~> 2.1.0' -gem 'jwt', '~> 2.1.0'
+gem 'omniauth-salesforce', '~> 1.0', '>= 1.0.5'
+gem 'rack-oauth2', '~> 1.9', '>= 1.9.3' +gem 'rack-oauth2', '~> 1.9', '>= 1.9.3'
+gem 'jwt', '~> 2.1' +gem 'jwt', '~> 2.1', '>= 2.1.0'
# Kerberos authentication. EE-only # Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos gem 'gssapi', group: :kerberos
@@ -57,14 +57,14 @@ @@ -58,14 +58,14 @@
gem 'invisible_captcha', '~> 0.12.1' gem 'invisible_captcha', '~> 0.12.1'
# Two-factor authentication # Two-factor authentication
@ -88,7 +88,7 @@ gitlab Gemfile
# GitLab Pages letsencrypt support # GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.6' gem 'acme-client', '~> 2.0', '>= 2.0.6'
@@ -72,12 +72,12 @@ @@ -73,12 +73,12 @@
gem 'browser', '~> 4.2' gem 'browser', '~> 4.2'
# GPG # GPG
@ -103,7 +103,7 @@ gitlab Gemfile
gem 'net-ldap' gem 'net-ldap'
# API # API
@@ -85,16 +85,16 @@ @@ -86,16 +86,16 @@
# Remove config/initializers/grape_patch.rb # Remove config/initializers/grape_patch.rb
gem 'grape', '= 1.4.0' gem 'grape', '= 1.4.0'
gem 'grape-entity', '~> 0.7.1' gem 'grape-entity', '~> 0.7.1'
@ -111,20 +111,20 @@ gitlab Gemfile
+gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors' +gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
# GraphQL API # GraphQL API
-gem 'graphql', '~> 1.10.5' -gem 'graphql', '~> 1.11.4'
+gem 'graphql', '~> 1.10', '>= 1.10.5' +gem 'graphql', '~> 1.11', '>= 1.11.4'
# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771 # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
# https://gitlab.com/gitlab-org/gitlab/issues/31747 # https://gitlab.com/gitlab-org/gitlab/issues/31747
-gem 'graphiql-rails', '~> 1.4.10' -gem 'graphiql-rails', '~> 1.4.10'
+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.2'
-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
+gem 'graphql-docs', '~> 1.6', group: [:development, :test] +gem 'graphql-docs', '~> 1.6', group: [:development, :test]
# 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'
@@ -103,7 +103,7 @@ @@ -104,7 +104,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'
@@ -113,7 +113,7 @@ @@ -114,7 +114,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'
@@ -128,7 +128,7 @@ @@ -129,7 +129,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'
@@ -141,23 +141,23 @@ @@ -142,23 +142,23 @@
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.12' gem 'html-pipeline', '~> 2.12'
@ -185,7 +185,7 @@ gitlab Gemfile
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
# Calendar rendering # Calendar rendering
@@ -168,7 +168,7 @@ @@ -169,7 +169,7 @@
gem 'diff_match_patch', '~> 0.1.0' gem 'diff_match_patch', '~> 0.1.0'
# Application server # Application server
@ -194,7 +194,7 @@ gitlab Gemfile
# 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'
@@ -189,13 +189,13 @@ @@ -190,13 +190,13 @@
gem 'acts-as-taggable-on', '~> 6.0' gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs # Background jobs
@ -211,7 +211,7 @@ gitlab Gemfile
# HTTP requests # HTTP requests
gem 'httparty', '~> 0.16.4' gem 'httparty', '~> 0.16.4'
@@ -207,14 +207,14 @@ @@ -208,14 +208,14 @@
gem 'ruby-progressbar' gem 'ruby-progressbar'
# GitLab settings # GitLab settings
@ -229,7 +229,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript # Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.4' gem 'js_regex', '~> 3.4'
@@ -227,23 +227,23 @@ @@ -228,23 +228,23 @@
gem 'connection_pool', '~> 2.0' gem 'connection_pool', '~> 2.0'
# Redis session store # Redis session store
@ -257,7 +257,7 @@ gitlab Gemfile
# Hangouts Chat integration # Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5' gem 'hangouts-chat', '~> 0.0.5'
@@ -257,11 +257,11 @@ @@ -256,11 +256,11 @@
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration # Kubernetes integration
@ -265,13 +265,13 @@ gitlab Gemfile
+gem 'kubeclient', '~> 4.6' +gem 'kubeclient', '~> 4.6'
# Sanitize user input # Sanitize user input
gem 'sanitize', '~> 4.6' gem 'sanitize', '~> 5.2.1'
-gem 'babosa', '~> 1.0.2' -gem 'babosa', '~> 1.0.2'
+gem 'babosa', '~> 1.0', '>= 1.0.2' +gem 'babosa', '~> 1.0', '>= 1.0.2'
# Sanitizes SVG input # Sanitizes SVG input
gem 'loofah', '~> 2.2' gem 'loofah', '~> 2.2'
@@ -270,7 +270,7 @@ @@ -269,7 +269,7 @@
gem 'licensee', '~> 8.9' gem 'licensee', '~> 8.9'
# Ace editor # Ace editor
@ -280,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'
@@ -288,8 +288,8 @@ @@ -287,8 +287,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'
@ -291,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'
@@ -301,24 +301,24 @@ @@ -300,24 +300,24 @@
gem "gitlab-license", "~> 1.0" gem "gitlab-license", "~> 1.0"
# Protect against bruteforcing # Protect against bruteforcing
@ -299,7 +299,7 @@ gitlab Gemfile
+gem 'rack-attack', '~> 6.3' +gem 'rack-attack', '~> 6.3'
# Sentry integration # Sentry integration
gem 'sentry-raven', '~> 2.9' gem 'sentry-raven', '~> 3.0'
-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'
@ -314,20 +314,21 @@ gitlab Gemfile
-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'
gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext_i18n_rails_js', '~> 1.3'
-gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'gettext', '~> 3.3', require: false, group: :development
+gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development
-gem 'batch-loader', '~> 1.4.0' -gem 'batch-loader', '~> 1.4.0'
+gem 'batch-loader', '~> 1.4' +gem 'batch-loader', '~> 1.4'
# Perf bar # Perf bar
gem 'peek', '~> 1.1' gem 'peek', '~> 1.1'
@@ -351,29 +351,29 @@ @@ -348,30 +348,30 @@
end
group :development, :test do group :development, :test do
gem 'bullet', '~> 6.0.2' - gem 'bullet', '~> 6.1.0'
- gem 'pry-byebug', '~> 3.5.1', platform: :mri - gem 'pry-byebug', '~> 3.9.0', platform: :mri
+ gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri + gem 'bullet', '~> 6.1'
+ gem 'pry-byebug', '~> 3.9', platform: :mri
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
gem 'awesome_print', require: false gem 'awesome_print', require: false
@ -336,7 +337,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' + gem 'factory_bot_rails', '~> 5.1', '>= 5.1.0'
+ 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)
@ -363,7 +364,7 @@ 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
@@ -381,11 +381,11 @@ @@ -379,11 +379,11 @@
gem 'simplecov-cobertura', '~> 1.3.1', 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
@ -377,7 +378,7 @@ gitlab Gemfile
gem 'timecop', '~> 0.9.1' gem 'timecop', '~> 0.9.1'
@@ -402,18 +402,18 @@ @@ -400,18 +400,18 @@
end end
group :test do group :test do
@ -402,7 +403,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.12.0' gem 'test-prof', '~> 0.12.0'
@@ -432,7 +432,7 @@ @@ -430,7 +430,7 @@
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
@ -411,7 +412,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
@@ -446,8 +446,8 @@ @@ -444,8 +444,8 @@
gem 'health_check', '~> 3.0' gem 'health_check', '~> 3.0'
# System information # System information
@ -422,7 +423,7 @@ gitlab Gemfile
# NTP client # NTP client
gem 'net-ntp' gem 'net-ntp'
@@ -463,13 +463,13 @@ @@ -461,13 +461,13 @@
end end
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
@ -438,7 +439,7 @@ gitlab Gemfile
# Feature toggles # Feature toggles
gem 'flipper', '~> 0.17.1' gem 'flipper', '~> 0.17.1'
@@ -487,12 +487,12 @@ @@ -485,12 +485,12 @@
# Countries list # Countries list
gem 'countries', '~> 3.0' gem 'countries', '~> 3.0'
@ -453,7 +454,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`
@@ -506,9 +506,9 @@ @@ -504,11 +504,11 @@
gem 'valid_email', '~> 0.1' gem 'valid_email', '~> 0.1'
# JSON # JSON
@ -468,3 +469,5 @@ gitlab Gemfile
+gem 'oj', '~> 3.10', '>= 3.10.6' +gem 'oj', '~> 3.10', '>= 3.10.6'
+gem 'multi_json', '~> 1.14', '>= 1.14.1' +gem 'multi_json', '~> 1.14', '>= 1.14.1'
+gem 'yajl-ruby', '~> 1.4', '>= 1.4.1', require: 'yajl' +gem 'yajl-ruby', '~> 1.4', '>= 1.4.1', require: 'yajl'
gem 'webauthn', '~> 2.3'

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

@ -2,44 +2,43 @@ Bundler will fail when it can't find these locally
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -94,7 +94,6 @@ @@ -95,7 +95,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.2'
-gem 'graphql-docs', '~> 1.6', group: [:development, :test] -gem 'graphql-docs', '~> 1.6', group: [:development, :test]
# 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'
@@ -316,7 +315,6 @@ @@ -315,7 +314,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'
-gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development -gem 'gettext', '~> 3.3', require: false, group: :development
gem 'batch-loader', '~> 1.4' gem 'batch-loader', '~> 1.4'
@@ -335,20 +333,6 @@ @@ -334,19 +332,6 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
-group :development do -group :development do
- gem 'brakeman', '~> 4.2', require: false - gem 'brakeman', '~> 4.2', require: false
- gem 'danger', '~> 6.0', require: false - gem 'danger', '~> 8.0', require: false
- -
- gem 'letter_opener_web', '~> 1.3.4' - gem 'letter_opener_web', '~> 1.3.4'
- -
- # Better errors handler - # Better errors handler
- gem 'better_errors', '~> 2.7.1' - gem 'better_errors', '~> 2.7.1'
- gem 'binding_of_caller', '~> 0.8.0'
- -
- # thin instead webrick - # thin instead webrick
- gem 'thin', '~> 1.7.0' - gem 'thin', '~> 1.7.0'
-end -end
- -
group :development, :test do group :development, :test do
gem 'bullet', '~> 6.0.2' gem 'bullet', '~> 6.1'
gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri gem 'pry-byebug', '~> 3.9', platform: :mri
@@ -369,18 +353,6 @@ @@ -367,18 +352,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'
@ -58,7 +57,7 @@ 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.17' gem 'knapsack', '~> 1.17'
@@ -396,11 +368,6 @@ @@ -394,11 +367,6 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
end end

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
@@ -333,7 +333,7 @@ @@ -332,7 +332,7 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
-group :development, :test do -group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true" +if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bullet', '~> 6.0.2' gem 'bullet', '~> 6.1'
gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri gem 'pry-byebug', '~> 3.9', platform: :mri
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
@@ -366,9 +366,7 @@ @@ -365,9 +365,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

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
@@ -197,7 +197,7 @@ @@ -198,7 +198,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
@@ -146,7 +146,7 @@ @@ -147,7 +147,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
@@ -141,7 +141,6 @@ @@ -142,7 +142,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
@@ -170,14 +170,9 @@ @@ -171,14 +171,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'

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

@ -2,12 +2,12 @@ Embed this gem until gitlab moved to 7.x version
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -130,7 +130,7 @@ @@ -131,7 +131,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' gem 'elasticsearch-api', '~> 6.8.2'
gem 'aws-sdk-core', '~> 3' gem 'aws-sdk-core', '~> 3'

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

@ -2,12 +2,12 @@ Embed this gem until gitlab moved to 7.x version
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -131,7 +131,7 @@ @@ -132,7 +132,7 @@
# Search # Search
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' gem 'elasticsearch-api', '~> 6.8.2'
gem 'aws-sdk-core', '~> 3' gem 'aws-sdk-core', '~> 3'
gem 'aws-sdk-cloudformation', '~> 1' gem 'aws-sdk-cloudformation', '~> 1'

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

@ -2,9 +2,9 @@ This gem is used only in gitlab Enterprise Edition
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -48,9 +48,6 @@ @@ -49,9 +49,6 @@
gem 'rack-oauth2', '~> 1.9', '>= 1.9.3' gem 'rack-oauth2', '~> 1.9', '>= 1.9.3'
gem 'jwt', '~> 2.1' gem 'jwt', '~> 2.1', '>= 2.1.0'
-# Kerberos authentication. EE-only -# Kerberos authentication. EE-only
-gem 'gssapi', group: :kerberos -gem 'gssapi', group: :kerberos
@ -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'
@@ -291,8 +288,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/0484-relax-grape-entity.patch vendored
View file

@ -2,7 +2,7 @@ Debian already has 0.8
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -81,7 +81,7 @@ @@ -82,7 +82,7 @@
# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged # Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged
# Remove config/initializers/grape_patch.rb # Remove config/initializers/grape_patch.rb
gem 'grape', '= 1.4.0' gem 'grape', '= 1.4.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
@@ -182,7 +182,7 @@ @@ -183,7 +183,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
@@ -179,7 +179,7 @@ @@ -180,7 +180,7 @@
gem 'acts-as-taggable-on', '~> 6.0' gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs # Background jobs

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

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -359,7 +359,7 @@ @@ -360,7 +360,7 @@
gem 'rspec_profiling', '~> 0.0.5' gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false

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

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -360,7 +360,6 @@ @@ -361,7 +361,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
@@ -369,7 +369,6 @@ @@ -370,7 +370,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/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
@@ -159,64 +159,6 @@ @@ -162,64 +162,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": "3.2.0", - "@gitlab/eslint-plugin": "4.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",

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

@ -14,7 +14,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');
@@ -158,13 +157,13 @@ @@ -159,13 +158,13 @@
}, },
resolve: { resolve: {
@ -31,7 +31,7 @@ Use debian packaged node modules when available
}, },
module: { module: {
@@ -177,9 +176,13 @@ @@ -178,9 +177,13 @@
}, },
{ {
test: /\.js$/, test: /\.js$/,
@ -46,7 +46,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'),
@@ -513,19 +516,6 @@ @@ -516,19 +519,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(),
@ -66,7 +66,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),
@@ -559,6 +549,7 @@ @@ -563,6 +553,7 @@
node: { node: {
fs: 'empty', // sqljs requires fs fs: 'empty', // sqljs requires fs
@ -87,15 +87,15 @@ 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.158.0", "@gitlab/svgs": "1.164.0",
"@gitlab/ui": "20.3.1", "@gitlab/ui": "21.3.1",
@@ -55,29 +49,14 @@ @@ -55,29 +49,14 @@
"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",
- "autosize": "^4.0.2", - "autosize": "^4.0.2",
"aws-sdk": "^2.637.0", "aws-sdk": "^2.637.0",
- "axios": "^0.19.0", - "axios": "^0.20.0",
- "babel-loader": "^8.0.6", - "babel-loader": "^8.0.6",
"babel-plugin-lodash": "^3.3.4", "babel-plugin-lodash": "^3.3.4",
"bootstrap": "4.4.1", "bootstrap": "4.4.1",
@ -119,7 +119,7 @@ Use debian packaged node modules when available
"diff": "^3.4.0", "diff": "^3.4.0",
"document-register-element": "1.14.3", "document-register-element": "1.14.3",
"dompurify": "^2.0.11", "dompurify": "^2.0.11",
@@ -85,27 +64,17 @@ @@ -85,29 +64,19 @@
"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",
@ -130,6 +130,8 @@ Use debian packaged node modules when available
- "glob": "^7.1.6", - "glob": "^7.1.6",
"graphql": "^14.7.0", "graphql": "^14.7.0",
"graphql-tag": "^2.10.1", "graphql-tag": "^2.10.1",
"gray-matter": "^4.0.2",
"immer": "^7.0.7",
- "imports-loader": "^0.8.0", - "imports-loader": "^0.8.0",
"ipaddr.js": "^1.9.1", "ipaddr.js": "^1.9.1",
- "jed": "^1.1.1", - "jed": "^1.1.1",
@ -143,27 +145,27 @@ Use debian packaged node modules when available
- "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",
- "lodash": "^4.17.15", - "lodash": "^4.17.20",
"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",
@@ -115,13 +84,8 @@ @@ -117,13 +86,8 @@
"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.4.1",
- "mousetrap": "^1.4.6", - "mousetrap": "1.6.5",
"pdfjs-dist": "^2.0.943", "pdfjs-dist": "^2.0.943",
"pikaday": "^1.8.0", "pikaday": "^1.8.0",
- "popper.js": "^1.16.1", - "popper.js": "^1.16.1",
- "prismjs": "^1.6.0", - "prismjs": "^1.21.0",
- "prosemirror-markdown": "^1.3.0", - "prosemirror-markdown": "^1.3.0",
- "prosemirror-model": "^1.6.4", - "prosemirror-model": "^1.6.4",
"raphael": "^2.2.7", "raphael": "^2.2.7",
"raw-loader": "^4.0.0", "raw-loader": "^4.0.0",
"select2": "3.5.2-browserify", "select2": "3.5.2-browserify",
@@ -133,30 +97,19 @@ @@ -135,31 +99,20 @@
"style-loader": "^1.1.3", "style-loader": "^1.1.3",
"swagger-ui-dist": "^3.26.2", "swagger-ui-dist": "^3.32.4",
"three": "^0.84.0", "three": "^0.84.0",
- "three-orbit-controls": "^82.1.0", - "three-orbit-controls": "^82.1.0",
- "three-stl-loader": "^1.0.4", - "three-stl-loader": "^1.0.4",
@ -178,11 +180,12 @@ Use debian packaged node modules when available
- "vue": "^2.6.10", - "vue": "^2.6.10",
"vue-apollo": "^3.0.3", "vue-apollo": "^3.0.3",
"vue-loader": "^15.9.0", "vue-loader": "^15.9.0",
"vue-router": "^3.0.2", "vue-router": "^3.4.3",
- "vue-template-compiler": "^2.6.10", - "vue-template-compiler": "^2.6.10",
"vue-virtual-scroll-list": "^1.4.4", "vue-virtual-scroll-list": "^1.4.4",
"vuedraggable": "^2.23.0", "vuedraggable": "^2.23.0",
"vuex": "^3.1.0", "vuex": "^3.5.1",
"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",

2
debian/patches/series vendored
View file

@ -3,7 +3,6 @@
0110-make-test-dependencies-conditional.patch 0110-make-test-dependencies-conditional.patch
0340-relax-httparty.patch 0340-relax-httparty.patch
0350-relax-rdoc.patch 0350-relax-rdoc.patch
0350-relax-method-source.patch
0430-remove-gitlab-markup.patch 0430-remove-gitlab-markup.patch
0440-remove-unicorn.patch 0440-remove-unicorn.patch
0480-embed-elasticsearch-model.patch 0480-embed-elasticsearch-model.patch
@ -12,7 +11,6 @@
0484-relax-grape-entity.patch 0484-relax-grape-entity.patch
0485-relax-gitlab-sidekiq-fetcher.patch 0485-relax-gitlab-sidekiq-fetcher.patch
0486-relax-sidekiq.patch 0486-relax-sidekiq.patch
0488-relax-bullet.patch
0499-10-relax-capybara.patch 0499-10-relax-capybara.patch
0499-20-remove-capybara-screenshot.patch 0499-20-remove-capybara-screenshot.patch
0499-30-remove-guard-rspec.patch 0499-30-remove-guard-rspec.patch