realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refresh patches

Browse source
This commit is contained in:
Pirate Praveen 2021-03-08 22:12:33 +05:30
parent b0ff9938b4
commit e353b2665a
21 changed files with 122 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ gitlab Gemfile
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -1,8 +1,8 @@ @@ -1,16 +1,16 @@
source 'https://rubygems.org' source 'https://rubygems.org'
-gem 'rails', '~> 6.0.3.1' -gem 'rails', '~> 6.0.3.1'
@ -12,9 +12,6 @@ gitlab Gemfile
-gem 'bootsnap', '~> 1.4.6' -gem 'bootsnap', '~> 1.4.6'
+gem 'bootsnap', '~> 1.4', '>= 1.4.6' +gem 'bootsnap', '~> 1.4', '>= 1.4.6'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
@@ -10,10 +10,10 @@
# Responders respond_to and respond_with # Responders respond_to and respond_with
gem 'responders', '~> 3.0' gem 'responders', '~> 3.0'
@ -27,26 +24,9 @@ gitlab Gemfile
# Supported DBs # Supported DBs
gem 'pg', '~> 1.1' gem 'pg', '~> 1.1'
@@ -22,34 +22,34 @@ @@ -30,23 +30,23 @@
gem 'grape-path-helpers', '~> 1.5'
gem 'faraday', '~> 1.0'
-gem 'marginalia', '~> 1.9.0'
+gem 'marginalia', '~> 1.9'
# Authentication libraries
-gem 'devise', '~> 4.7.2'
+gem 'devise', '~> 4.7', '>= 4.7.2'
# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828)
-gem 'bcrypt', '3.1.12'
-gem 'doorkeeper', '~> 5.3.0'
-gem 'doorkeeper-openid_connect', '~> 1.7.4'
+gem 'bcrypt', '~> 3.1', '>= 3.1.12'
+gem 'doorkeeper', '~> 5.3'
+gem 'doorkeeper-openid_connect', '~> 1.7','>= 1.7.4'
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-azure-oauth2', '~> 0.0.9' gem 'omniauth-azure-oauth2', '~> 0.0.9'
-gem 'omniauth-cas3', '~> 1.1.4' -gem 'omniauth-cas3', '~> 1.1.4'
-gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-facebook', '~> 4.0.0'
@ -76,8 +56,12 @@ gitlab Gemfile
# Kerberos authentication. EE-only # Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos gem 'gssapi', group: :kerberos
@@ -60,14 +60,14 @@ @@ -54,17 +54,17 @@
gem 'invisible_captcha', '~> 0.12.1' # Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0'
-gem 'invisible_captcha', '~> 1.1.0'
+gem 'invisible_captcha', '~> 1.1'
# Two-factor authentication # Two-factor authentication
-gem 'devise-two-factor', '~> 3.1.0' -gem 'devise-two-factor', '~> 3.1.0'
@ -95,7 +79,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'
@@ -75,12 +75,12 @@ @@ -72,27 +72,27 @@
gem 'browser', '~> 4.2' gem 'browser', '~> 4.2'
# GPG # GPG
@ -107,12 +91,11 @@ gitlab Gemfile
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' -gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.1', '>= 2.1.1', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1', '>= 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap' gem 'net-ldap', '~> 0.16.3'
# API # API
@@ -88,16 +88,16 @@ -gem 'grape', '~> 1.5.1'
# Remove config/initializers/grape_patch.rb +gem 'grape', '~> 1.5', '>= 1.5.1'
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'
@ -132,7 +115,7 @@ gitlab Gemfile
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
gem 'hashie' gem 'hashie'
@@ -108,17 +108,17 @@ @@ -103,17 +103,17 @@
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
@ -145,7 +128,7 @@ gitlab Gemfile
+gem 'mini_magick', '~> 4.10', '>= 4.10.1' +gem 'mini_magick', '~> 4.10', '>= 4.10.1'
# for backups # for backups
gem 'fog-aws', '~> 3.7' gem 'fog-aws', '~> 3.8'
# 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.
-gem 'fog-core', '= 2.1.0' -gem 'fog-core', '= 2.1.0'
@ -153,7 +136,7 @@ gitlab Gemfile
gem 'fog-google', '~> 1.12' gem 'fog-google', '~> 1.12'
gem 'fog-local', '~> 0.6' gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0' gem 'fog-openstack', '~> 1.0'
@@ -133,12 +133,12 @@ @@ -128,37 +128,37 @@
gem 'unf', '~> 0.1.4' gem 'unf', '~> 0.1.4'
# Seed data # Seed data
@ -168,13 +151,14 @@ gitlab Gemfile
gem 'aws-sdk-core', '~> 3' gem 'aws-sdk-core', '~> 3'
gem 'aws-sdk-cloudformation', '~> 1' gem 'aws-sdk-cloudformation', '~> 1'
gem 'aws-sdk-s3', '~> 1' gem 'aws-sdk-s3', '~> 1'
@@ -146,24 +146,24 @@ gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.12' -gem 'html-pipeline', '~> 2.13.2'
-gem 'deckar01-task_list', '2.3.1' -gem 'deckar01-task_list', '2.3.1'
-gem 'gitlab-markup', '~> 1.7.1' -gem 'gitlab-markup', '~> 1.7.1'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'html-pipeline', '~> 2.13', '>= 2.13.2'
+gem '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'
@ -197,13 +181,13 @@ gitlab Gemfile
+gem 'rouge', '~> 3.26' +gem 'rouge', '~> 3.26'
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.11.1'
+gem 'bootstrap_form', '~> 4.2' +gem 'bootstrap_form', '~> 4.2'
+gem 'nokogiri', '~> 1.10', '>= 1.10.9' +gem 'nokogiri', '~> 1.11','>= 1.11.1'
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
# Calendar rendering # Calendar rendering
@@ -174,7 +174,7 @@ @@ -169,7 +169,7 @@
gem 'diff_match_patch', '~> 0.1.0' gem 'diff_match_patch', '~> 0.1.0'
# Application server # Application server
@ -212,8 +196,17 @@ 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'
@@ -195,13 +195,13 @@ @@ -179,7 +179,7 @@
gem 'acts-as-taggable-on', '~> 6.0' end
group :puma do
- gem 'puma', '~> 5.1.1', require: false
+ gem 'puma', '~> 5.1', '>= 5.1.1', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false
end
@@ -190,13 +190,13 @@
gem 'acts-as-taggable-on', '~> 7.0'
# Background jobs # Background jobs
-gem 'sidekiq', '~> 5.2.7' -gem 'sidekiq', '~> 5.2.7'
@ -229,7 +222,7 @@ gitlab Gemfile
# HTTP requests # HTTP requests
gem 'httparty', '~> 0.16.4' gem 'httparty', '~> 0.16.4'
@@ -213,14 +213,14 @@ @@ -208,14 +208,14 @@
gem 'ruby-progressbar', '~> 1.10' gem 'ruby-progressbar', '~> 1.10'
# GitLab settings # GitLab settings
@ -247,7 +240,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript # Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.4' gem 'js_regex', '~> 3.4'
@@ -233,39 +233,39 @@ @@ -228,23 +228,23 @@
gem 'connection_pool', '~> 2.0' gem 'connection_pool', '~> 2.0'
# Redis session store # Redis session store
@ -262,8 +255,8 @@ gitlab Gemfile
+gem 'hipchat', '~> 1.5' +gem 'hipchat', '~> 1.5'
# Jira integration # Jira integration
-gem 'jira-ruby', '~> 2.0.0' -gem 'jira-ruby', '~> 2.1.4'
+gem 'jira-ruby', '~> 2.0' +gem 'jira-ruby', '~> 2.1', '>= 2.1.4'
gem 'atlassian-jwt', '~> 0.2.0' gem 'atlassian-jwt', '~> 0.2.0'
# Flowdock integration # Flowdock integration
@ -275,12 +268,7 @@ gitlab Gemfile
# Hangouts Chat integration # Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5' gem 'hangouts-chat', '~> 0.0.5'
@@ -256,11 +256,11 @@
# Asana integration
-gem 'asana', '0.10.2'
+gem 'asana', '~> 0.10.2'
# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration # Kubernetes integration
@ -295,7 +283,7 @@ gitlab Gemfile
# Sanitizes SVG input # Sanitizes SVG input
gem 'loofah', '~> 2.2' gem 'loofah', '~> 2.2'
@@ -288,8 +288,8 @@ @@ -283,8 +283,8 @@
gem 'rack-proxy', '~> 0.6.0' gem 'rack-proxy', '~> 0.6.0'
@ -306,7 +294,7 @@ gitlab Gemfile
gem 'addressable', '~> 2.7' gem 'addressable', '~> 2.7'
gem 'gemojione', '~> 3.3' gem 'gemojione', '~> 3.3'
@@ -300,7 +300,7 @@ @@ -295,7 +295,7 @@
gem "gitlab-license", "~> 1.0" gem "gitlab-license", "~> 1.0"
# Protect against bruteforcing # Protect against bruteforcing
@ -315,20 +303,20 @@ gitlab Gemfile
# Sentry integration # Sentry integration
gem 'sentry-raven', '~> 3.0' gem 'sentry-raven', '~> 3.0'
@@ -308,10 +308,10 @@ @@ -303,10 +303,10 @@
# PostgreSQL query parsing # PostgreSQL query parsing
gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query' gem 'pg_query', '~> 1.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'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.13.3' -gem 'gitlab-labkit', '0.14.0'
+gem 'gitlab-labkit', '~> 0.13.3' +gem 'gitlab-labkit', '~> 0.14.0'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0' gem 'thrift', '>= 0.14.0'
@@ -319,11 +319,11 @@ @@ -314,11 +314,11 @@
# I18n # I18n
gem 'ruby_parser', '~> 3.15', require: false gem 'ruby_parser', '~> 3.15', require: false
gem 'rails-i18n', '~> 6.0' gem 'rails-i18n', '~> 6.0'
@ -342,24 +330,26 @@ gitlab Gemfile
# Perf bar # Perf bar
gem 'peek', '~> 1.1' gem 'peek', '~> 1.1'
@@ -355,37 +355,37 @@ @@ -350,39 +350,39 @@
end
group :development, :test do group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false - gem 'deprecation_toolkit', '~> 1.5.1', require: false
- gem 'bullet', '~> 6.1.0' - gem 'bullet', '~> 6.1.0'
- gem 'pry-byebug', '~> 3.9.0', platform: :mri + gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
+ gem 'bullet', '~> 6.1' + gem 'bullet', '~> 6.1'
+ gem 'pry-byebug', '~> 3.9', platform: :mri gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
gem 'pry-remote'
gem 'awesome_print', require: false gem 'awesome_print', require: false
- gem 'database_cleaner', '~> 1.7.0' - gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 5.1.0' - gem 'factory_bot_rails', '~> 6.1.0'
- gem 'rspec-rails', '~> 4.0.0' - gem 'rspec-rails', '~> 4.0.1'
+ gem 'database_cleaner', '~> 1.7' + gem 'database_cleaner', '~> 1.7'
+ gem 'factory_bot_rails', '~> 5.1' + gem 'factory_bot_rails', '~> 6.1'
+ gem 'rspec-rails', '~> 4.0' + gem 'rspec-rails', '~> 4.0', '>= 4.0.1'
# 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)
- gem 'minitest', '~> 5.11.0' - gem 'minitest', '~> 5.11.0'
@ -373,8 +363,8 @@ gitlab Gemfile
+ gem 'spring', '~> 2.1' + gem 'spring', '~> 2.1'
+ gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4' + gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 5.3.0', require: false - gem 'gitlab-styles', '~> 6.0.0', require: false
+ gem 'gitlab-styles', '~> 5.3', require: false + gem 'gitlab-styles', '~> 6.0', require: false
gem 'scss_lint', '~> 0.59.0', require: false gem 'scss_lint', '~> 0.59.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false gem 'haml_lint', '~> 0.36.0', require: false
@ -391,7 +381,7 @@ gitlab Gemfile
gem 'timecop', '~> 0.9.1' gem 'timecop', '~> 0.9.1'
@@ -407,18 +407,18 @@ @@ -404,18 +404,18 @@
end end
group :test do group :test do
@ -401,9 +391,9 @@ gitlab Gemfile
gem 'rspec_profiling', '~> 0.0.6' gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false
- gem 'capybara', '~> 3.33.0' - gem 'capybara', '~> 3.34.0'
- gem 'capybara-screenshot', '~> 1.0.22' - gem 'capybara-screenshot', '~> 1.0.22'
+ gem 'capybara', '~> 3.33' + gem 'capybara', '~> 3.34'
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22' + gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
gem 'selenium-webdriver', '~> 3.142' gem 'selenium-webdriver', '~> 3.142'
@ -416,7 +406,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'
@@ -437,7 +437,7 @@ @@ -434,7 +434,7 @@
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
@ -425,7 +415,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
@@ -451,8 +451,8 @@ @@ -448,8 +448,8 @@
gem 'health_check', '~> 3.0' gem 'health_check', '~> 3.0'
# System information # System information
@ -436,12 +426,12 @@ gitlab Gemfile
# NTP client # NTP client
gem 'net-ntp' gem 'net-ntp'
@@ -468,13 +468,13 @@ @@ -465,13 +465,13 @@
end end
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.7.0.pre.rc1' -gem 'gitaly', '~> 13.8.0.pre.rc2'
+gem 'gitaly', '~> 13.7' +gem 'gitaly', '~> 13.8'
-gem 'grpc', '~> 1.30.2' -gem 'grpc', '~> 1.30.2'
+gem 'grpc', '~> 1.30', '>= 1.30.2' +gem 'grpc', '~> 1.30', '>= 1.30.2'
@ -453,7 +443,7 @@ gitlab Gemfile
# Feature toggles # Feature toggles
gem 'flipper', '~> 0.17.1' gem 'flipper', '~> 0.17.1'
@@ -493,12 +493,12 @@ @@ -490,12 +490,12 @@
# Countries list # Countries list
gem 'countries', '~> 3.0' gem 'countries', '~> 3.0'
@ -468,7 +458,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`
@@ -512,12 +512,12 @@ @@ -509,12 +509,12 @@
gem 'valid_email', '~> 0.1' gem 'valid_email', '~> 0.1'
# JSON # JSON

14
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
@@ -97,7 +97,6 @@ @@ -92,7 +92,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', '>= 2.0.2' gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'
@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
gem 'hashie' gem 'hashie'
@@ -321,7 +320,6 @@ @@ -316,7 +315,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'
@@ -340,19 +338,6 @@ @@ -336,19 +334,6 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
@ -36,13 +36,13 @@ Bundler will fail when it can't find these locally
-end -end
- -
group :development, :test do group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
gem 'bullet', '~> 6.1' gem 'bullet', '~> 6.1'
@@ -374,12 +359,6 @@ @@ -371,12 +356,6 @@
gem 'spring', '~> 2.1' gem 'spring', '~> 2.1'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4' gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 5.3', require: false - gem 'gitlab-styles', '~> 6.0', require: false
- -
- gem 'scss_lint', '~> 0.59.0', require: false - gem 'scss_lint', '~> 0.59.0', require: false
- gem 'haml_lint', '~> 0.36.0', require: false - gem 'haml_lint', '~> 0.36.0', require: false
@ -51,7 +51,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,16 +375,6 @@ @@ -393,16 +372,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
@@ -338,7 +338,7 @@ @@ -334,7 +334,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 'deprecation_toolkit', '~> 1.5.1', require: false gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
gem 'bullet', '~> 6.1' gem 'bullet', '~> 6.1'
gem 'pry-byebug', '~> 3.9', platform: :mri gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
@@ -373,9 +373,7 @@ @@ -370,9 +370,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
@@ -203,7 +203,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
@@ -151,7 +151,7 @@ @@ -146,7 +146,7 @@
gem 'commonmarker', '~> 0.21' gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3' gem 'kramdown', '~> 2.3'
gem 'RedCloth', '~> 4.3', '>= 4.3.2' gem 'RedCloth', '~> 4.3', '>= 4.3.2'

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

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

11
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
@@ -176,14 +176,9 @@ @@ -171,11 +171,6 @@
# 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'
@ -13,10 +13,5 @@ gitlab-puma changes is included in puma package.
-end -end
- -
group :puma do group :puma do
- gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false gem 'puma', '~> 5.1', '>= 5.1.1', require: false
- gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false
+ gem 'puma', '~> 4.3.3', require: false
+ gem 'puma_worker_killer', '~> 0.1.1', require: false
end
# 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
@@ -135,7 +135,7 @@ @@ -130,7 +130,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
@@ -136,7 +136,7 @@ @@ -131,7 +131,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

@ -2,7 +2,7 @@ This gem is used only in gitlab Enterprise Edition
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -51,9 +51,6 @@ @@ -48,9 +48,6 @@
gem 'rack-oauth2', '~> 1.16' gem 'rack-oauth2', '~> 1.16'
gem 'jwt', '~> 2.1' gem 'jwt', '~> 2.1'
@ -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'
@@ -290,8 +287,6 @@ @@ -285,8 +282,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
@@ -84,7 +84,7 @@ @@ -79,7 +79,7 @@
# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged
# Remove config/initializers/grape_patch.rb # API
gem 'grape', '= 1.4.0' gem 'grape', '~> 1.5', '>= 1.5.1'
-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'

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
@@ -188,7 +188,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'

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

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

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

@ -1,10 +1,10 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -368,7 +368,7 @@ @@ -365,7 +365,7 @@
gem 'rspec_profiling', '~> 0.0.6' gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false
- gem 'capybara', '~> 3.33' - gem 'capybara', '~> 3.34'
+ gem 'capybara', '~> 3.12' + gem 'capybara', '~> 3.12'
gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22' gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
gem 'selenium-webdriver', '~> 3.142' gem 'selenium-webdriver', '~> 3.142'

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

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -369,7 +369,6 @@ @@ -366,7 +366,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
@@ -378,7 +378,6 @@ @@ -375,7 +375,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,7 +3,7 @@ rouge update is blocked by
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -155,7 +155,7 @@ @@ -150,7 +150,7 @@
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-plantuml', '~> 0.0.12'
gem 'asciidoctor-kroki', '~> 0.2.2', require: false gem 'asciidoctor-kroki', '~> 0.2.2', require: false
@ -11,4 +11,4 @@ rouge update is blocked by
+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'
gem 'nokogiri', '~> 1.10', '>= 1.10.9' gem 'nokogiri', '~> 1.11','>= 1.11.1'

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

@ -2,7 +2,7 @@ newer version is in the archive
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -94,7 +94,7 @@ @@ -89,7 +89,7 @@
# 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', '>= 2.0.2' gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'

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

@ -2,14 +2,14 @@ These are not required in production
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -160,66 +160,7 @@ @@ -162,65 +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": "5.0.0", - "@gitlab/eslint-plugin": "6.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.1.2",
- "acorn": "^6.3.0", - "acorn": "^6.3.0",
- "axios-mock-adapter": "^1.15.0", - "axios-mock-adapter": "^1.15.0",
- "babel-jest": "^26.5.2", - "babel-jest": "^26.5.2",
@ -54,7 +54,7 @@ These are not required in production
- "nodemon": "^2.0.4", - "nodemon": "^2.0.4",
- "pixelmatch": "^4.0.2", - "pixelmatch": "^4.0.2",
- "postcss": "^7.0.14", - "postcss": "^7.0.14",
- "prettier": "1.18.2", - "prettier": "2.2.1",
- "readdir-enhanced": "^2.2.4", - "readdir-enhanced": "^2.2.4",
- "stylelint": "^10.1.0", - "stylelint": "^10.1.0",
- "stylelint-config-recommended": "^2.2.0", - "stylelint-config-recommended": "^2.2.0",
@ -65,8 +65,6 @@ These are not required in production
- "xhr-mock": "^2.5.1", - "xhr-mock": "^2.5.1",
- "yarn-check-webpack-plugin": "^1.2.0", - "yarn-check-webpack-plugin": "^1.2.0",
- "yarn-deduplicate": "^1.1.1" - "yarn-deduplicate": "^1.1.1"
- }, },
+ },
"blockedDependencies": { "blockedDependencies": {
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue" "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
},

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

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

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

@ -58,8 +58,8 @@ Use debian packaged node modules when available
}, },
{ {
test: /\.js$/, test: /\.js$/,
- exclude: path => - exclude: (path) =>
+ exclude: [ path => + exclude: [ (path) =>
/node_modules\/(?!tributejs)|node_modules|vendor[\\/]assets/.test(path) && /node_modules\/(?!tributejs)|node_modules|vendor[\\/]assets/.test(path) &&
!/\.vue\.js/.test(path), !/\.vue\.js/.test(path),
+ /\/usr\/share\/nodejs/, + /\/usr\/share\/nodejs/,
@ -125,9 +125,9 @@ Use debian packaged node modules when available
+ "@babel/plugin-syntax-import-meta": "link:/usr/share/nodejs/@babel/plugin-syntax-import-meta", + "@babel/plugin-syntax-import-meta": "link:/usr/share/nodejs/@babel/plugin-syntax-import-meta",
+ "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env", + "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
"@gitlab/at.js": "1.5.5", "@gitlab/at.js": "1.5.5",
"@gitlab/svgs": "1.177.0", "@gitlab/favicon-overlay": "2.0.0",
"@gitlab/tributejs": "1.0.0", "@gitlab/svgs": "1.178.0",
@@ -56,29 +56,29 @@ @@ -57,29 +57,29 @@
"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",
@ -167,10 +167,10 @@ 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.2.4", "dompurify": "^2.2.6",
@@ -88,41 +88,41 @@ @@ -90,41 +90,41 @@
"emoji-unicode-version": "^0.2.1",
"exports-loader": "^0.7.0", "exports-loader": "^0.7.0",
"fast-mersenne-twister": "1.0.2",
"file-loader": "^5.1.0", "file-loader": "^5.1.0",
- "font-awesome": "4.7.0", - "font-awesome": "4.7.0",
+ "font-awesome": "link:/usr/share/nodejs/font-awesome", + "font-awesome": "link:/usr/share/nodejs/font-awesome",
@ -201,10 +201,10 @@ Use debian packaged node modules when available
+ "katex": "link:/usr/share/nodejs/katex", + "katex": "link:/usr/share/nodejs/katex",
"lodash": "^4.17.20", "lodash": "^4.17.20",
"marked": "^0.3.12", "marked": "^0.3.12",
"mathjax": "3",
- "mermaid": "^8.5.2", - "mermaid": "^8.5.2",
+ "mermaid": "link:/usr/share/nodejs/mermaid",
"mersenne-twister": "1.1.0",
- "minimatch": "^3.0.4", - "minimatch": "^3.0.4",
+ "mermaid": "link:/usr/share/nodejs/mermaid",
+ "minimatch": "link:/usr/share/nodejs/minimatch", + "minimatch": "link:/usr/share/nodejs/minimatch",
"miragejs": "^0.1.40", "miragejs": "^0.1.40",
"mock-apollo-client": "^0.5.0", "mock-apollo-client": "^0.5.0",
@ -225,8 +225,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",
"select2": "3.5.2-browserify", "select2": "3.5.2-browserify",
@@ -134,26 +134,25 @@ @@ -136,26 +136,25 @@
"style-loader": "^1.1.3", "style-loader": "^1.3.0",
"swagger-ui-dist": "^3.43.0", "swagger-ui-dist": "^3.43.0",
"three": "^0.84.0", "three": "^0.84.0",
- "three-orbit-controls": "^82.1.0", - "three-orbit-controls": "^82.1.0",
@ -244,7 +244,7 @@ Use debian packaged node modules when available
- "vue": "^2.6.12", - "vue": "^2.6.12",
+ "vue": "link:/usr/share/nodejs/vue", + "vue": "link:/usr/share/nodejs/vue",
"vue-apollo": "^3.0.3", "vue-apollo": "^3.0.3",
"vue-loader": "^15.9.5", "vue-loader": "^15.9.6",
"vue-router": "3.4.9", "vue-router": "3.4.9",
- "vue-template-compiler": "^2.6.12", - "vue-template-compiler": "^2.6.12",
+ "vue-template-compiler": "link:/usr/share/nodejs/vue-template-compiler", + "vue-template-compiler": "link:/usr/share/nodejs/vue-template-compiler",