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 2019-07-31 18:15:35 +00:00
parent e4101ca0fa
commit df44416e5d
22 changed files with 95 additions and 2262 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,16 +3,7 @@ gitlab Gemfile
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -1,7 +1,7 @@ @@ -8,7 +8,7 @@
source 'https://rubygems.org'
gem 'rails', '5.0.7.2'
-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
@@ -9,7 +9,7 @@
# Responders respond_to and respond_with # Responders respond_to and respond_with
gem 'responders', '~> 2.0' gem 'responders', '~> 2.0'
@ -21,7 +12,7 @@ gitlab Gemfile
# Default values for AR models # Default values for AR models
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
@@ -28,57 +28,57 @@ @@ -27,61 +27,61 @@
gem 'doorkeeper', '~> 4.3' gem 'doorkeeper', '~> 4.3'
gem 'doorkeeper-openid_connect', '~> 1.5' gem 'doorkeeper-openid_connect', '~> 1.5'
gem 'omniauth', '~> 1.8' gem 'omniauth', '~> 1.8'
@ -45,8 +36,12 @@ gitlab Gemfile
-gem 'omniauth_crowd', '~> 2.2.0' -gem 'omniauth_crowd', '~> 2.2.0'
+gem 'omniauth_crowd', '~> 2.2' +gem 'omniauth_crowd', '~> 2.2'
gem 'omniauth-authentiq', '~> 0.3.3' gem 'omniauth-authentiq', '~> 0.3.3'
gem 'omniauth_openid_connect', '~> 0.3.0'
gem "omniauth-ultraauth", '~> 0.0.2'
-gem 'omniauth-salesforce', '~> 1.0.5'
-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'
@ -92,12 +87,14 @@ gitlab Gemfile
# GraphQL API # GraphQL API
-gem 'graphql', '~> 1.8.0' -gem 'graphql', '~> 1.8.0'
-gem 'graphiql-rails', '~> 1.4.10' -gem 'graphiql-rails', '~> 1.4.10'
-gem 'apollo_upload_server', '~> 2.0.0.beta3'
+gem 'graphql', '~> 1.8' +gem 'graphql', '~> 1.8'
+gem 'graphiql-rails', '~> 1.4', '>= 1.4.10' +gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
+gem 'apollo_upload_server', '~> 2.0', '>= 2.0.0.beta3'
# 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'
@@ -87,7 +87,7 @@ @@ -90,7 +90,7 @@
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
@ -106,7 +103,7 @@ gitlab Gemfile
# Files attachments # Files attachments
gem 'carrierwave', '~> 1.3' gem 'carrierwave', '~> 1.3'
@@ -97,7 +97,7 @@ @@ -100,7 +100,7 @@
gem 'fog-aws', '~> 3.3' gem 'fog-aws', '~> 3.3'
# 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.
@ -115,7 +112,7 @@ gitlab Gemfile
gem 'fog-google', '~> 1.8' gem 'fog-google', '~> 1.8'
gem 'fog-local', '~> 0.6' gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0' gem 'fog-openstack', '~> 1.0'
@@ -111,38 +111,38 @@ @@ -114,38 +114,38 @@
gem 'unf', '~> 0.1.4' gem 'unf', '~> 0.1.4'
# Seed data # Seed data
@ -127,7 +124,7 @@ gitlab Gemfile
-gem 'deckar01-task_list', '2.2.0' -gem 'deckar01-task_list', '2.2.0'
-gem 'gitlab-markup', '~> 1.7.0' -gem 'gitlab-markup', '~> 1.7.0'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'deckar01-task_list', '~> 2.2' +gem 'deckar01-task_list', '2.2'
+gem 'gitlab-markup', '~> 1.7' +gem 'gitlab-markup', '~> 1.7'
+gem 'github-markup', '~> 1.7', require: 'github/markup' +gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.17' gem 'commonmarker', '~> 0.17'
@ -143,9 +140,9 @@ gitlab Gemfile
gem 'rouge', '~> 3.1' gem 'rouge', '~> 3.1'
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.1' -gem 'nokogiri', '~> 1.10.3'
+gem 'bootstrap_form', '~> 4.2' +gem 'bootstrap_form', '~> 4.2'
+gem 'nokogiri', '~> 1.10', '>= 1.10.1' +gem 'nokogiri', '~> 1.10', '>= 1.10.3'
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
# Calendar rendering # Calendar rendering
@ -156,7 +153,8 @@ gitlab Gemfile
+gem 'diffy', '~> 3.1' +gem 'diffy', '~> 3.1'
# Application server # Application server
gem 'rack', '~> 2.0.7' -gem 'rack', '~> 2.0.7'
+gem 'rack', '~> 2.0', '>= 2.0.7'
group :unicorn do group :unicorn do
- gem 'unicorn', '~> 5.4.1' - gem 'unicorn', '~> 5.4.1'
@ -164,19 +162,19 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4' gem 'unicorn-worker-killer', '~> 0.4.4'
end end
@@ -158,9 +158,9 @@ @@ -161,9 +161,9 @@
gem 'acts-as-taggable-on', '~> 6.0' gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs # Background jobs
-gem 'sidekiq', '~> 5.2.1' -gem 'sidekiq', '~> 5.2.7'
+gem 'sidekiq', '~> 5.2', '>= 5.2.1' +gem 'sidekiq', '~> 5.2', '>= 5.2.7'
gem 'sidekiq-cron', '~> 1.0' gem 'sidekiq-cron', '~> 1.0'
-gem 'redis-namespace', '~> 1.6.0' -gem 'redis-namespace', '~> 1.6.0'
+gem 'redis-namespace', '~> 1.6' +gem 'redis-namespace', '~> 1.6'
gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
# Cron Parser # Cron Parser
@@ -176,14 +176,14 @@ @@ -179,14 +179,14 @@
gem 'ruby-progressbar' gem 'ruby-progressbar'
# GitLab settings # GitLab settings
@ -194,7 +192,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript # Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1' gem 'js_regex', '~> 3.1'
@@ -192,7 +192,7 @@ @@ -195,7 +195,7 @@
gem 'device_detector' gem 'device_detector'
# Cache # Cache
@ -203,7 +201,7 @@ gitlab Gemfile
# Redis # Redis
gem 'redis', '~> 3.2' gem 'redis', '~> 3.2'
@@ -202,7 +202,7 @@ @@ -205,7 +205,7 @@
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration # HipChat integration
@ -212,7 +210,7 @@ gitlab Gemfile
# JIRA integration # JIRA integration
gem 'jira-ruby', '~> 1.4' gem 'jira-ruby', '~> 1.4'
@@ -211,7 +211,7 @@ @@ -214,7 +214,7 @@
gem 'flowdock', '~> 0.7' gem 'flowdock', '~> 0.7'
# Slack integration # Slack integration
@ -221,7 +219,7 @@ gitlab Gemfile
# Hangouts Chat integration # Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5' gem 'hangouts-chat', '~> 0.0.5'
@@ -223,11 +223,11 @@ @@ -226,11 +226,11 @@
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration # Kubernetes integration
@ -235,7 +233,7 @@ gitlab Gemfile
# Sanitizes SVG input # Sanitizes SVG input
gem 'loofah', '~> 2.2' gem 'loofah', '~> 2.2'
@@ -236,10 +236,10 @@ @@ -239,10 +239,10 @@
gem 'licensee', '~> 8.9' gem 'licensee', '~> 8.9'
# Protect against bruteforcing # Protect against bruteforcing
@ -248,14 +246,13 @@ 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'
@@ -257,39 +257,39 @@ @@ -260,21 +260,21 @@
gem 'webpack-rails', '~> 0.9.10' gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0' gem 'rack-proxy', '~> 0.6.0'
-gem 'sass-rails', '~> 5.0.6' -gem 'sassc-rails', '~> 2.1.0'
+gem 'sass-rails', '~> 5.0', '>= 5.0.6'
gem 'sass', '~> 3.5'
-gem 'uglifier', '~> 2.7.2' -gem 'uglifier', '~> 2.7.2'
+gem 'sassc-rails', '~> 2.1'
+gem 'uglifier', '~> 2.7', '>= 2.7.2' +gem 'uglifier', '~> 2.7', '>= 2.7.2'
-gem 'addressable', '~> 2.5.2' -gem 'addressable', '~> 2.5.2'
@ -274,6 +271,9 @@ gitlab Gemfile
-gem 'premailer-rails', '~> 1.9.7' -gem 'premailer-rails', '~> 1.9.7'
+gem 'premailer-rails', '~> 1.9', '>= 1.9.7' +gem 'premailer-rails', '~> 1.9', '>= 1.9.7'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.2.0'
@@ -282,19 +282,19 @@
# I18n # I18n
gem 'ruby_parser', '~> 3.8', require: false gem 'ruby_parser', '~> 3.8', require: false
gem 'rails-i18n', '~> 5.1' gem 'rails-i18n', '~> 5.1'
@ -283,8 +283,8 @@ gitlab Gemfile
-gem 'gettext', '~> 3.2.2', require: false, group: :development -gem 'gettext', '~> 3.2.2', require: false, group: :development
+gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development +gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development
-gem 'batch-loader', '~> 1.2.2' -gem 'batch-loader', '~> 1.4.0'
+gem 'batch-loader', '~> 1.2', '>= 1.2.2' +gem 'batch-loader', '~> 1.4'
# Perf bar # Perf bar
-gem 'peek', '~> 1.0.1' -gem 'peek', '~> 1.0.1'
@ -300,7 +300,7 @@ gitlab Gemfile
# Metrics # Metrics
group :metrics do group :metrics do
@@ -315,54 +315,54 @@ @@ -314,55 +314,55 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
# Better errors handler # Better errors handler
@ -331,7 +331,7 @@ gitlab Gemfile
+ gem 'database_cleaner', '~> 1.7' + gem 'database_cleaner', '~> 1.7'
+ gem 'factory_bot_rails', '~> 4.8', '>= 4.8.2' + gem 'factory_bot_rails', '~> 4.8', '>= 4.8.2'
+ gem 'rspec-rails', '~> 3.7' + gem 'rspec-rails', '~> 3.7'
gem 'rspec-retry', '~> 0.4.5' gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5' gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3' gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false gem 'rspec-parameterized', require: false
@ -343,25 +343,27 @@ gitlab Gemfile
# Generate Fake data # Generate Fake data
gem 'ffaker', '~> 2.10' gem 'ffaker', '~> 2.10'
- gem 'capybara', '~> 2.16.1' - gem 'capybara', '~> 2.18.0'
- gem 'capybara-screenshot', '~> 1.0.18' - gem 'capybara-screenshot', '~> 1.0.22'
+ gem 'capybara', '~> 2.16', '>= 2.16.1' + gem 'capybara', '~> 2.18'
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.18' + gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
gem 'selenium-webdriver', '~> 3.12' gem 'selenium-webdriver', '~> 3.141'
- gem 'spring', '~> 2.0.0' - gem 'spring', '~> 2.0.0'
- gem 'spring-commands-rspec', '~> 1.0.4' - gem 'spring-commands-rspec', '~> 1.0.4'
+ 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', '~> 2.4', require: false gem 'gitlab-styles', '~> 2.6', 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.54.0' gem 'rubocop', '~> 0.68.1'
- gem 'rubocop-performance', '~> 1.1.0'
- gem 'rubocop-rspec', '~> 1.22.1' - gem 'rubocop-rspec', '~> 1.22.1'
+ gem 'rubocop-performance', '~> 1.1'
+ gem 'rubocop-rspec', '~> 1.22', '>= 1.22.1' + gem 'rubocop-rspec', '~> 1.22', '>= 1.22.1'
gem 'scss_lint', '~> 0.56.0', require: false gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.28.0', require: false gem 'haml_lint', '~> 0.30.0', require: false
gem 'simplecov', '~> 0.14.0', require: false gem 'simplecov', '~> 0.14.0', require: false
gem 'bundler-audit', '~> 0.5.0', require: false gem 'bundler-audit', '~> 0.5.0', require: false
@ -414,13 +416,14 @@ gitlab Gemfile
end end
# Gitaly GRPC client # Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.22.1', require: 'gitaly' -gem 'gitaly-proto', '~> 1.27.2', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.22', '>= 1.22.1', require: 'gitaly' +gem 'gitaly-proto', '~> 1.27', '>= 1.27.2', require: 'gitaly'
-gem 'grpc', '~> 1.15.0' -gem 'grpc', '~> 1.19.0'
+gem 'grpc', '~> 1.15' +gem 'grpc', '~> 1.19'
gem 'google-protobuf', '~> 3.6' -gem 'google-protobuf', '~> 3.7.1'
+gem 'google-protobuf', '~> 3.7', '>= 3.7.1'
-gem 'toml-rb', '~> 1.0.0', require: false -gem 'toml-rb', '~> 1.0.0', require: false
+gem 'toml-rb', '~> 1.0', require: false +gem 'toml-rb', '~> 1.0', require: false

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

@ -2,23 +2,23 @@ Bundler will fail when it can't find these locally
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -279,7 +279,6 @@ @@ -284,7 +284,6 @@
gem 'rails-i18n', '~> 5.1' gem 'rails-i18n', '~> 5.1'
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.2', '>= 3.2.2', require: false, group: :development
gem 'batch-loader', '~> 1.2', '>= 1.2.2' gem 'batch-loader', '~> 1.4'
@@ -307,21 +306,6 @@ @@ -306,21 +305,6 @@
gem 'jaeger-client', '~> 0.10.0' gem 'raindrops', '~> 0.18'
end end
-group :development do -group :development do
- gem 'foreman', '~> 0.84.0' - gem 'foreman', '~> 0.84.0'
- gem 'brakeman', '~> 4.2', require: false - gem 'brakeman', '~> 4.2', require: false
- -
- gem 'letter_opener_web', '~> 1.3.0' - gem 'letter_opener_web', '~> 1.3.4'
- gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
- -
- # Better errors handler - # Better errors handler

4
debian/patches/0108-make-mysql-optional.patch vendored
View file

@ -9,7 +9,7 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -15,8 +15,9 @@ @@ -14,8 +14,9 @@
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
# Supported DBs # Supported DBs
@ -20,4 +20,4 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
+gem 'pg', '~> 1.1' if ENV["DB"] == "all" || ENV["DB"] == "postgres" +gem 'pg', '~> 1.1' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem 'rugged', '~> 0.28' gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.0' gem 'grape-path-helpers', '~> 1.1'

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

@ -1,7 +1,7 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -307,7 +307,7 @@ group :tracing do @@ -306,7 +306,7 @@
gem 'jaeger-client', '~> 0.10.0' gem 'raindrops', '~> 0.18'
end end
-group :development, :test do -group :development, :test do
@ -9,7 +9,7 @@
gem 'bootsnap', '~> 1.4' gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET'] gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
@@ -359,9 +359,9 @@ group :development, :test do @@ -359,9 +359,9 @@
gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
gem 'timecop', '~> 0.8.0' gem 'timecop', '~> 0.8.0'

2
debian/patches/0290-skip-peek-mysql2.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -286,7 +286,6 @@ gem 'batch-loader', '~> 1.2', '>= 1.2.2' @@ -291,7 +291,6 @@
# Perf bar # Perf bar
gem 'peek', '~> 1.0', '>= 1.0.1' gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2' gem 'peek-gc', '~> 0.0.2'

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

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -168,7 +168,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' @@ -171,7 +171,7 @@
gem 'fugit', '~> 1.1' gem 'fugit', '~> 1.1'
# HTTP requests # HTTP requests

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

@ -1,9 +1,9 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -117,7 +117,6 @@ gem 'seed-fu', '~> 2.3', '>= 2.3.7' @@ -120,7 +120,6 @@
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.8' gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '~> 2.2' gem 'deckar01-task_list', '2.2'
-gem 'gitlab-markup', '~> 1.7' -gem 'gitlab-markup', '~> 1.7'
gem 'github-markup', '~> 1.7', require: 'github/markup' gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.17' gem 'commonmarker', '~> 0.17'

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

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -146,11 +146,6 @@ @@ -149,11 +149,6 @@
gem 'unicorn-worker-killer', '~> 0.4.4' gem 'unicorn-worker-killer', '~> 0.4.4'
end end

2
debian/patches/0450-remove-bullet.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -302,7 +302,6 @@ end @@ -301,7 +301,6 @@
if ENV["INCLUDE_TEST_DEPENDS"] == "true" if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bootsnap', '~> 1.4' gem 'bootsnap', '~> 1.4'

10
debian/patches/0470-relax-rails.patch vendored
View file

@ -1,10 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '5.0.7.2'
+gem 'rails', '~> 5.0'
gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
# Improves copy-on-write performance for MRI

11
debian/patches/0490-relax-nokogiri.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -129,7 +129,7 @@ gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2'
-gem 'nokogiri', '~> 1.10', '>= 1.10.1'
+gem 'nokogiri', '~> 1.10'
gem 'escape_utils', '~> 1.1'
# Calendar rendering

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

@ -1,6 +1,6 @@
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -138,58 +138,6 @@ @@ -137,58 +137,6 @@
"xterm": "^3.5.0" "xterm": "^3.5.0"
}, },
"devDependencies": { "devDependencies": {

2
debian/patches/0610-source-init-functions.patch vendored
View file

@ -13,7 +13,7 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/12954
### Environment variables ### Environment variables
RAILS_ENV="production" RAILS_ENV="production"
@@ -38,7 +41,7 @@ @@ -39,7 +42,7 @@
sidekiq_pid_path="$pid_path/sidekiq.pid" sidekiq_pid_path="$pid_path/sidekiq.pid"
mail_room_enabled=false mail_room_enabled=false
mail_room_pid_path="$pid_path/mail_room.pid" mail_room_pid_path="$pid_path/mail_room.pid"

2121
debian/patches/0680-rails-5_1.patch vendored
View file

File diff suppressed because it is too large Load diff

24
debian/patches/0686-rails-5.1-embed.patch vendored
View file

@ -3,18 +3,18 @@
@@ -1,6 +1,16 @@ @@ -1,6 +1,16 @@
source 'https://rubygems.org' source 'https://rubygems.org'
-gem 'rails', '~> 5.0' -gem 'rails', '5.1.7'
+gem "rails", "5.1.6.1", path: 'vendor/gems/rails-5.1.6.1' +gem "rails", "5.1.7", path: 'vendor/gems/rails-5.1.7'
+gem "railties", "5.1.6.1", path: 'vendor/gems/railties-5.1.6.1' +gem "railties", "5.1.7", path: 'vendor/gems/railties-5.1.7'
+gem "activerecord", "5.1.6.1", path: 'vendor/gems/activerecord-5.1.6.1' +gem "activerecord", "5.1.7", path: 'vendor/gems/activerecord-5.1.7'
+gem "activesupport", "5.1.6.1", path: 'vendor/gems/activesupport-5.1.6.1' +gem "activesupport", "5.1.7", path: 'vendor/gems/activesupport-5.1.7'
+gem "activemodel", "5.1.6.1", path: 'vendor/gems/activemodel-5.1.6.1' +gem "activemodel", "5.1.7", path: 'vendor/gems/activemodel-5.1.7'
+gem "activejob", "5.1.6.1", path: 'vendor/gems/activejob-5.1.6.1' +gem "activejob", "5.1.7", path: 'vendor/gems/activejob-5.1.7'
+gem "actioncable", "5.1.6.1", path: 'vendor/gems/actioncable-5.1.6.1' +gem "actioncable", "5.1.7", path: 'vendor/gems/actioncable-5.1.7'
+gem "actionmailer", "5.1.6.1", path: 'vendor/gems/actionmailer-5.1.6.1' +gem "actionmailer", "5.1.7", path: 'vendor/gems/actionmailer-5.1.7'
+gem "actionpack", "5.1.6.1", path: 'vendor/gems/actionpack-5.1.6.1' +gem "actionpack", "5.1.7", path: 'vendor/gems/actionpack-5.1.7'
+gem "actionview", "5.1.6.1", path: 'vendor/gems/actionview-5.1.6.1' +gem "actionview", "5.1.7", path: 'vendor/gems/actionview-5.1.7'
+gem "arel", "8.0.0", path: 'vendor/gems/arel-8.0.0' +gem "arel", "8.0.0", path: 'vendor/gems/arel-8.0.0'
gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
# Improves copy-on-write performance for MRI # Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'

11
debian/patches/0687-opentracing-embed.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -306,7 +306,7 @@
group :tracing do
# OpenTracing
- gem 'opentracing', '~> 0.4.3'
+ gem 'opentracing', '0.4.3', path: 'vendor/gems/opentracing-0.4.3'
gem 'jaeger-client', '~> 0.10.0'
end

12
debian/patches/0688-jaeger-client-embed.patch vendored
View file

@ -1,12 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -307,7 +307,8 @@
group :tracing do
# OpenTracing
gem 'opentracing', '0.4.3', path: 'vendor/gems/opentracing-0.4.3'
- gem 'jaeger-client', '~> 0.10.0'
+ gem 'jaeger-client', '0.10.0', path: 'vendor/gems/jaeger-client-0.10.0'
+ gem 'thrift', '0.11.0.0', path: 'vendor/gems/thrift-0.11.0.0'
end
if ENV["INCLUDE_TEST_DEPENDS"] == "true"

8
debian/patches/0689-jwt-and-omniauth-google-oauth2.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -45,7 +45,7 @@ gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4' @@ -44,7 +44,7 @@
gem 'omniauth-facebook', '~> 4.0' gem 'omniauth-facebook', '~> 4.0'
gem 'omniauth-github', '~> 1.3' gem 'omniauth-github', '~> 1.3'
gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2' gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
@ -9,9 +9,9 @@
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 1.10' gem 'omniauth-saml', '~> 1.10'
@@ -54,7 +54,7 @@ gem 'omniauth-twitter', '~> 1.4' @@ -56,7 +56,7 @@
gem 'omniauth_crowd', '~> 2.2' gem "omniauth-ultraauth", '~> 0.0.2'
gem 'omniauth-authentiq', '~> 0.3.3' 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'
+gem 'jwt', '2.1', path: 'vendor/gems/jwt-2.1.0' +gem 'jwt', '2.1', path: 'vendor/gems/jwt-2.1.0'

2
debian/patches/0730-install-graphql-tag.patch vendored
View file

@ -3,7 +3,7 @@ Author: Utkarsh Gupta <guptautkarsh2102@gmail.com>
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -78,6 +78,7 @@ @@ -77,6 +77,7 @@
"fuzzaldrin-plus": "^0.5.0", "fuzzaldrin-plus": "^0.5.0",
"glob": "^7.1.2", "glob": "^7.1.2",
"graphql": "^14.0.2", "graphql": "^14.0.2",

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

@ -1,6 +1,6 @@
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -39,32 +39,13 @@ @@ -38,32 +38,13 @@
"apollo-client": "^2.5.1", "apollo-client": "^2.5.1",
"apollo-upload-client": "^10.0.0", "apollo-upload-client": "^10.0.0",
"at.js": "^1.5.4", "at.js": "^1.5.4",
@ -33,7 +33,7 @@
"deckar01-task_list": "^2.2.0", "deckar01-task_list": "^2.2.0",
"diff": "^3.4.0", "diff": "^3.4.0",
"document-register-element": "1.13.1", "document-register-element": "1.13.1",
@@ -75,33 +56,20 @@ @@ -74,33 +55,20 @@
"exports-loader": "^0.7.0", "exports-loader": "^0.7.0",
"file-loader": "^3.0.1", "file-loader": "^3.0.1",
"formdata-polyfill": "^3.0.11", "formdata-polyfill": "^3.0.11",
@ -53,7 +53,7 @@
- "jszip-utils": "^0.0.2", - "jszip-utils": "^0.0.2",
"katex": "^0.10.0", "katex": "^0.10.0",
"marked": "^0.3.12", "marked": "^0.3.12",
"mermaid": "^8.0.0-rc.8", "mermaid": "^8.0.0",
"monaco-editor": "^0.15.6", "monaco-editor": "^0.15.6",
"monaco-editor-webpack-plugin": "^1.7.0", "monaco-editor-webpack-plugin": "^1.7.0",
- "mousetrap": "^1.4.6", - "mousetrap": "^1.4.6",
@ -67,7 +67,7 @@
"raw-loader": "^1.0.0", "raw-loader": "^1.0.0",
"sanitize-html": "^1.16.1", "sanitize-html": "^1.16.1",
"select2": "3.5.2-browserify", "select2": "3.5.2-browserify",
@@ -114,19 +82,14 @@ @@ -113,19 +81,14 @@
"stylelint-error-string-formatter": "1.0.2", "stylelint-error-string-formatter": "1.0.2",
"svg4everybody": "2.1.9", "svg4everybody": "2.1.9",
"three": "^0.84.0", "three": "^0.84.0",
@ -87,7 +87,7 @@
"vue-router": "^3.0.2", "vue-router": "^3.0.2",
"vue-template-compiler": "^2.6.10", "vue-template-compiler": "^2.6.10",
"vue-virtual-scroll-list": "^1.3.1", "vue-virtual-scroll-list": "^1.3.1",
@@ -134,7 +97,6 @@ @@ -133,7 +96,6 @@
"webpack": "^4.29.0", "webpack": "^4.29.0",
"webpack-bundle-analyzer": "^3.0.3", "webpack-bundle-analyzer": "^3.0.3",
"webpack-cli": "^3.2.1", "webpack-cli": "^3.2.1",

8
debian/patches/bump-devise-to-4-6.patch vendored
View file

@ -5,7 +5,7 @@ Author: Utkarsh Gupta <guptautkarsh2102@gmail.com>
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -35,7 +35,7 @@ @@ -34,7 +34,7 @@
gem 'faraday', '~> 0.12' gem 'faraday', '~> 0.12'
# Authentication libraries # Authentication libraries
@ -16,7 +16,7 @@ Author: Utkarsh Gupta <guptautkarsh2102@gmail.com>
gem 'omniauth', '~> 1.8' gem 'omniauth', '~> 1.8'
--- a/Gemfile.lock --- a/Gemfile.lock
+++ b/Gemfile.lock +++ b/Gemfile.lock
@@ -153,7 +153,7 @@ @@ -156,7 +156,7 @@
descendants_tracker (0.0.4) descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1) thread_safe (~> 0.3, >= 0.3.1)
device_detector (1.0.0) device_detector (1.0.0)
@ -25,7 +25,7 @@ Author: Utkarsh Gupta <guptautkarsh2102@gmail.com>
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0) railties (>= 4.1.0, < 6.0)
@@ -986,7 +986,7 @@ @@ -1032,7 +1032,7 @@
database_cleaner (~> 1.7.0) database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.2.0) deckar01-task_list (= 2.2.0)
device_detector device_detector
@ -36,7 +36,7 @@ Author: Utkarsh Gupta <guptautkarsh2102@gmail.com>
discordrb-webhooks-blackst0ne (~> 3.3) discordrb-webhooks-blackst0ne (~> 3.3)
--- a/app/models/user.rb --- a/app/models/user.rb
+++ b/app/models/user.rb +++ b/app/models/user.rb
@@ -1498,15 +1498,6 @@ @@ -1497,15 +1497,6 @@
devise_mailer.__send__(notification, self, *args).deliver_later # rubocop:disable GitlabSecurity/PublicSend devise_mailer.__send__(notification, self, *args).deliver_later # rubocop:disable GitlabSecurity/PublicSend
end end

5
debian/patches/series vendored
View file

@ -9,9 +9,7 @@
0430-remove-gitlab-markup.patch 0430-remove-gitlab-markup.patch
0440-remove-puma.patch 0440-remove-puma.patch
0450-remove-bullet.patch 0450-remove-bullet.patch
0470-relax-rails.patch
#0480-relax-acts-as-taggable-on.patch #0480-relax-acts-as-taggable-on.patch
0490-relax-nokogiri.patch
0500-set-webpack-root.patch 0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch 0510-remove-dev-dependencies.patch
0520-add-system-lib-path-for-webpack.patch 0520-add-system-lib-path-for-webpack.patch
@ -21,12 +19,9 @@
0640-relax-ruby-version.patch 0640-relax-ruby-version.patch
0660-fix-gitlab-yml-path.patch 0660-fix-gitlab-yml-path.patch
0670-allow-doorkeepr-4_3.patch 0670-allow-doorkeepr-4_3.patch
0680-rails-5_1.patch
#0680-rails-5-migrations.patch #0680-rails-5-migrations.patch
#0685-bump-fog.patch #0685-bump-fog.patch
0686-rails-5.1-embed.patch 0686-rails-5.1-embed.patch
0687-opentracing-embed.patch
0688-jaeger-client-embed.patch
0689-jwt-and-omniauth-google-oauth2.patch 0689-jwt-and-omniauth-google-oauth2.patch
0690-debian-usage-ping.patch 0690-debian-usage-ping.patch
0700-add-salsa-link-to-help.patch 0700-add-salsa-link-to-help.patch