Refresh patches and delete patches already applied upstream
This commit is contained in:
Sruthi Chandran
parent
da6367271f
commit
86421cc06c
22 changed files with 104 additions and 520 deletions
117
debian/patches/0050-relax-stable-libs.patch
vendored
117
debian/patches/0050-relax-stable-libs.patch
vendored
|
|
@ -3,7 +3,7 @@ gitlab Gemfile
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -8,7 +8,7 @@
|
||||
@@ -8,10 +8,10 @@
|
||||
# Responders respond_to and respond_with
|
||||
gem 'responders', '~> 2.0'
|
||||
|
||||
|
|
@ -11,7 +11,11 @@ gitlab Gemfile
|
|||
+gem 'sprockets', '~> 3.7'
|
||||
|
||||
# Default values for AR models
|
||||
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
|
||||
-gem 'default_value_for', '~> 3.2.0'
|
||||
+gem 'default_value_for', '~> 3.2'
|
||||
|
||||
# Supported DBs
|
||||
gem 'mysql2', '~> 0.4.10', group: :mysql
|
||||
@@ -27,63 +27,63 @@
|
||||
gem 'doorkeeper', '~> 4.3'
|
||||
gem 'doorkeeper-openid_connect', '~> 1.5'
|
||||
|
|
@ -21,11 +25,11 @@ gitlab Gemfile
|
|||
gem 'omniauth-azure-oauth2', '~> 0.0.9'
|
||||
-gem 'omniauth-cas3', '~> 1.1.4'
|
||||
-gem 'omniauth-facebook', '~> 4.0.0'
|
||||
+gem 'omniauth-cas3', '~> 1.1', '>=1.1.4'
|
||||
+gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4'
|
||||
+gem 'omniauth-facebook', '~> 4.0'
|
||||
gem 'omniauth-github', '~> 1.3'
|
||||
-gem 'omniauth-gitlab', '~> 1.0.2'
|
||||
+gem 'omniauth-gitlab', '~> 1.0', '>=1.0.2'
|
||||
+gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
|
||||
gem 'omniauth-google-oauth2', '~> 0.6.0'
|
||||
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
|
||||
gem 'omniauth-oauth2-generic', '~> 0.2.2'
|
||||
|
|
@ -41,8 +45,8 @@ gitlab Gemfile
|
|||
-gem 'omniauth-salesforce', '~> 1.0.5'
|
||||
-gem 'rack-oauth2', '~> 1.9.3'
|
||||
-gem 'jwt', '~> 2.1.0'
|
||||
+gem 'omniauth-salesforce', '~> 1.0', '>=1.0.5'
|
||||
+gem 'rack-oauth2', '~> 1.9', '>=1.9.3'
|
||||
+gem 'omniauth-salesforce', '~> 1.0', '>= 1.0.5'
|
||||
+gem 'rack-oauth2', '~> 1.9', '>= 1.9.3'
|
||||
+gem 'jwt', '~> 2.1'
|
||||
|
||||
# Spam and anti-bot protection
|
||||
|
|
@ -60,24 +64,24 @@ gitlab Gemfile
|
|||
# GitLab Pages
|
||||
-gem 'validates_hostname', '~> 1.0.6'
|
||||
-gem 'rubyzip', '~> 1.2.2', require: 'zip'
|
||||
+gem 'validates_hostname', '~> 1.0', '>=1.0.6'
|
||||
+gem 'rubyzip', '~> 1.2', '>=1.2.2', require: 'zip'
|
||||
+gem 'validates_hostname', '~> 1.0', '>= 1.0.6'
|
||||
+gem 'rubyzip', '~> 1.2', '>= 1.2.2', require: 'zip'
|
||||
# GitLab Pages letsencrypt support
|
||||
-gem 'acme-client', '~> 2.0.2'
|
||||
+gem 'acme-client', '~> 2.0', '>=2.0.2'
|
||||
+gem 'acme-client', '~> 2.0', '>= 2.0.2'
|
||||
|
||||
# Browser detection
|
||||
gem 'browser', '~> 2.5'
|
||||
|
||||
# GPG
|
||||
-gem 'gpgme', '~> 2.0.18'
|
||||
+gem 'gpgme', '~> 2.0', '>=2.0.18'
|
||||
+gem 'gpgme', '~> 2.0', '>= 2.0.18'
|
||||
|
||||
# LDAP Auth
|
||||
# GitLab fork with several improvements to original library. For full list of changes
|
||||
# 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', '>=2.1.1', require: 'omniauth-ldap'
|
||||
+gem 'gitlab_omniauth-ldap', '~> 2.1', '>= 2.1.1', require: 'omniauth-ldap'
|
||||
gem 'net-ldap'
|
||||
|
||||
# API
|
||||
|
|
@ -92,12 +96,12 @@ gitlab Gemfile
|
|||
-gem 'graphiql-rails', '~> 1.4.10'
|
||||
-gem 'apollo_upload_server', '~> 2.0.0.beta3'
|
||||
+gem 'graphql', '~> 1.8'
|
||||
+gem 'graphiql-rails', '~> 1.4', '>=1.4.10'
|
||||
+gem 'apollo_upload_server', '>=2.0.0.beta3'
|
||||
+gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
|
||||
+gem 'apollo_upload_server', '>= 2.0.0.beta3'
|
||||
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
|
||||
|
||||
# Disable strong_params so that Mash does not respond to :permitted?
|
||||
gem 'hashie-forbidden_attributes'
|
||||
@@ -92,7 +92,7 @@
|
||||
@@ -93,7 +93,7 @@
|
||||
gem 'kaminari', '~> 1.0'
|
||||
|
||||
# HAML
|
||||
|
|
@ -106,8 +110,8 @@ gitlab Gemfile
|
|||
|
||||
# Files attachments
|
||||
gem 'carrierwave', '~> 1.3'
|
||||
@@ -102,7 +102,7 @@
|
||||
gem 'fog-aws', '~> 3.3'
|
||||
@@ -103,7 +103,7 @@
|
||||
gem 'fog-aws', '~> 3.5'
|
||||
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
|
||||
# Also see config/initializers/fog_core_patch.rb.
|
||||
-gem 'fog-core', '= 2.1.0'
|
||||
|
|
@ -115,12 +119,12 @@ gitlab Gemfile
|
|||
gem 'fog-google', '~> 1.8'
|
||||
gem 'fog-local', '~> 0.6'
|
||||
gem 'fog-openstack', '~> 1.0'
|
||||
@@ -116,39 +116,39 @@
|
||||
@@ -117,39 +117,39 @@
|
||||
gem 'unf', '~> 0.1.4'
|
||||
|
||||
# Seed data
|
||||
-gem 'seed-fu', '~> 2.3.7'
|
||||
+gem 'seed-fu', '~> 2.3', '>=2.3.7'
|
||||
+gem 'seed-fu', '~> 2.3', '>= 2.3.7'
|
||||
|
||||
# Markdown and HTML processing
|
||||
gem 'html-pipeline', '~> 2.8'
|
||||
|
|
@ -132,21 +136,21 @@ gitlab Gemfile
|
|||
+gem 'github-markup', '~> 1.7', require: 'github/markup'
|
||||
gem 'commonmarker', '~> 0.17'
|
||||
-gem 'RedCloth', '~> 4.3.2'
|
||||
+gem 'RedCloth', '~> 4.3', '>=4.3.2'
|
||||
+gem 'RedCloth', '~> 4.3', '>= 4.3.2'
|
||||
gem 'rdoc', '~> 6.0'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
-gem 'asciidoctor', '~> 1.5.8'
|
||||
+gem 'asciidoctor', '~> 1.5', '>=1.5.8'
|
||||
-gem 'asciidoctor', '~> 2.0.10'
|
||||
+gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
|
||||
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
|
||||
gem 'asciidoctor-plantuml', '0.0.8'
|
||||
gem 'rouge', '~> 3.1'
|
||||
gem 'asciidoctor-plantuml', '0.0.9'
|
||||
gem 'rouge', '~> 3.5'
|
||||
gem 'truncato', '~> 0.7.11'
|
||||
-gem 'bootstrap_form', '~> 4.2.0'
|
||||
-gem 'nokogiri', '~> 1.10.3'
|
||||
+gem 'bootstrap_form', '~> 4.2'
|
||||
+gem 'nokogiri', '~> 1.10', '>=1.10.3'
|
||||
+gem 'nokogiri', '~> 1.10', '>= 1.10.3'
|
||||
gem 'escape_utils', '~> 1.1'
|
||||
|
||||
# Calendar rendering
|
||||
|
|
@ -158,15 +162,15 @@ gitlab Gemfile
|
|||
|
||||
# Application server
|
||||
-gem 'rack', '~> 2.0.7'
|
||||
+gem 'rack', '~> 2.0', '>=2.0.7'
|
||||
+gem 'rack', '~> 2.0', '>= 2.0.7'
|
||||
|
||||
group :unicorn do
|
||||
- gem 'unicorn', '~> 5.4.1'
|
||||
+ gem 'unicorn', '~> 5.4', '>=5.4.1'
|
||||
+ gem 'unicorn', '~> 5.4', '>= 5.4.1'
|
||||
gem 'unicorn-worker-killer', '~> 0.4.4'
|
||||
end
|
||||
|
||||
@@ -165,13 +165,13 @@
|
||||
@@ -166,13 +166,13 @@
|
||||
gem 'acts-as-taggable-on', '~> 6.0'
|
||||
|
||||
# Background jobs
|
||||
|
|
@ -183,7 +187,7 @@ gitlab Gemfile
|
|||
|
||||
# HTTP requests
|
||||
gem 'httparty', '~> 0.16.4'
|
||||
@@ -183,14 +183,14 @@
|
||||
@@ -184,14 +184,14 @@
|
||||
gem 'ruby-progressbar'
|
||||
|
||||
# GitLab settings
|
||||
|
|
@ -201,7 +205,7 @@ gitlab Gemfile
|
|||
|
||||
# Export Ruby Regex to Javascript
|
||||
gem 'js_regex', '~> 3.1'
|
||||
@@ -199,7 +199,7 @@
|
||||
@@ -200,7 +200,7 @@
|
||||
gem 'device_detector'
|
||||
|
||||
# Cache
|
||||
|
|
@ -210,16 +214,16 @@ gitlab Gemfile
|
|||
|
||||
# Redis
|
||||
gem 'redis', '~> 3.2'
|
||||
@@ -209,7 +209,7 @@
|
||||
@@ -210,7 +210,7 @@
|
||||
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
|
||||
|
||||
# HipChat integration
|
||||
-gem 'hipchat', '~> 1.5.0'
|
||||
+gem 'hipchat', '~> 1.5'
|
||||
|
||||
# JIRA integration
|
||||
# Jira integration
|
||||
gem 'jira-ruby', '~> 1.4'
|
||||
@@ -218,7 +218,7 @@
|
||||
@@ -219,7 +219,7 @@
|
||||
gem 'flowdock', '~> 0.7'
|
||||
|
||||
# Slack integration
|
||||
|
|
@ -228,7 +232,7 @@ gitlab Gemfile
|
|||
|
||||
# Hangouts Chat integration
|
||||
gem 'hangouts-chat', '~> 0.0.5'
|
||||
@@ -230,11 +230,11 @@
|
||||
@@ -231,11 +231,11 @@
|
||||
gem 'ruby-fogbugz', '~> 0.2.1'
|
||||
|
||||
# Kubernetes integration
|
||||
|
|
@ -242,7 +246,7 @@ gitlab Gemfile
|
|||
|
||||
# Sanitizes SVG input
|
||||
gem 'loofah', '~> 2.2'
|
||||
@@ -243,10 +243,10 @@
|
||||
@@ -244,10 +244,10 @@
|
||||
gem 'licensee', '~> 8.9'
|
||||
|
||||
# Protect against bruteforcing
|
||||
|
|
@ -255,7 +259,7 @@ gitlab Gemfile
|
|||
|
||||
# Detect and convert string character encoding
|
||||
gem 'charlock_holmes', '~> 0.7.5'
|
||||
@@ -264,21 +264,21 @@
|
||||
@@ -265,21 +265,21 @@
|
||||
gem 'webpack-rails', '~> 0.9.10'
|
||||
gem 'rack-proxy', '~> 0.6.0'
|
||||
|
||||
|
|
@ -282,7 +286,7 @@ gitlab Gemfile
|
|||
|
||||
# LabKit: Tracing and Correlation
|
||||
gem 'gitlab-labkit', '~> 0.3.0'
|
||||
@@ -286,19 +286,19 @@
|
||||
@@ -287,19 +287,19 @@
|
||||
# I18n
|
||||
gem 'ruby_parser', '~> 3.8', require: false
|
||||
gem 'rails-i18n', '~> 5.1'
|
||||
|
|
@ -307,16 +311,16 @@ gitlab Gemfile
|
|||
-gem 'peek-redis', '~> 1.2.0'
|
||||
+gem 'peek-redis', '~> 1.2'
|
||||
|
||||
# Metrics
|
||||
group :metrics do
|
||||
@@ -327,46 +327,46 @@
|
||||
# Memory benchmarks
|
||||
gem 'derailed_benchmarks', require: false
|
||||
@@ -331,39 +331,39 @@
|
||||
|
||||
group :development, :test do
|
||||
gem 'bootsnap', '~> 1.4'
|
||||
- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
|
||||
- gem 'pry-byebug', '~> 3.5.1', platform: :mri
|
||||
+ 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
|
||||
gem 'pry-rails', '~> 0.3.4'
|
||||
|
||||
gem 'awesome_print', require: false
|
||||
|
|
@ -325,10 +329,10 @@ gitlab Gemfile
|
|||
|
||||
- gem 'database_cleaner', '~> 1.7.0'
|
||||
- gem 'factory_bot_rails', '~> 4.8.2'
|
||||
- gem 'rspec-rails', '~> 3.7.0'
|
||||
- gem 'rspec-rails', '~> 3.8.0'
|
||||
+ gem 'database_cleaner', '~> 1.7'
|
||||
+ gem 'factory_bot_rails', '~> 4.8', '>=4.8.2'
|
||||
+ gem 'rspec-rails', '~> 3.7'
|
||||
+ gem 'factory_bot_rails', '~> 4.8', '>= 4.8.2'
|
||||
+ gem 'rspec-rails', '~> 3.8'
|
||||
gem 'rspec-retry', '~> 0.6.1'
|
||||
gem 'rspec_profiling', '~> 0.0.5'
|
||||
gem 'rspec-set', '~> 0.1.3'
|
||||
|
|
@ -344,13 +348,13 @@ gitlab Gemfile
|
|||
- gem 'capybara', '~> 3.22.0'
|
||||
- gem 'capybara-screenshot', '~> 1.0.22'
|
||||
+ gem 'capybara', '~> 3.22'
|
||||
+ gem 'capybara-screenshot', '~> 1.0', '>=1.0.22'
|
||||
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
|
||||
gem 'selenium-webdriver', '~> 3.141'
|
||||
|
||||
- gem 'spring', '~> 2.0.0'
|
||||
- gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
+ 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.7', require: false
|
||||
# Pin these dependencies, otherwise a new rule could break the CI pipelines
|
||||
|
|
@ -358,21 +362,22 @@ gitlab Gemfile
|
|||
- gem 'rubocop-performance', '~> 1.1.0'
|
||||
- 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 'haml_lint', '~> 0.31.0', require: false
|
||||
gem 'simplecov', '~> 0.16.1', require: false
|
||||
@@ -371,7 +371,7 @@
|
||||
gem 'bundler-audit', '~> 0.5.0', require: false
|
||||
gem 'mdl', '~> 0.5.0', require: false
|
||||
|
||||
- gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||
+ gem 'benchmark-ips', '~> 2.3', require: false
|
||||
|
||||
gem 'license_finder', '~> 5.4', require: false
|
||||
gem 'knapsack', '~> 1.17'
|
||||
@@ -376,18 +376,18 @@
|
||||
@@ -380,18 +380,18 @@
|
||||
|
||||
gem 'stackprof', '~> 0.2.10', require: false
|
||||
gem 'derailed_benchmarks', require: false
|
||||
|
||||
- gem 'simple_po_parser', '~> 1.1.2', require: false
|
||||
+ gem 'simple_po_parser', '~> 1.1', '>=1.1.2', require: false
|
||||
|
|
@ -395,7 +400,7 @@ gitlab Gemfile
|
|||
gem 'concurrent-ruby', '~> 1.1'
|
||||
gem 'test-prof', '~> 0.2.5'
|
||||
gem 'rspec_junit_formatter'
|
||||
@@ -410,11 +410,11 @@
|
||||
@@ -414,11 +414,11 @@
|
||||
gem 'oauth2', '~> 1.4'
|
||||
|
||||
# Health check
|
||||
|
|
@ -409,19 +414,19 @@ gitlab Gemfile
|
|||
+gem 'sys-filesystem', '~> 1.1', '>= 1.1.6'
|
||||
|
||||
# SSH host key support
|
||||
gem 'net-ssh', '~> 5.0'
|
||||
@@ -427,13 +427,13 @@
|
||||
gem 'net-ssh', '~> 5.2'
|
||||
@@ -431,13 +431,13 @@
|
||||
end
|
||||
|
||||
# Gitaly GRPC client
|
||||
-gem 'gitaly-proto', '~> 1.32.0', require: 'gitaly'
|
||||
+gem 'gitaly-proto', '~> 1.32', require: 'gitaly'
|
||||
-gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly'
|
||||
+gem 'gitaly-proto', '~> 1.37', require: 'gitaly'
|
||||
|
||||
-gem 'grpc', '~> 1.19.0'
|
||||
+gem 'grpc', '~> 1.19'
|
||||
|
||||
-gem 'google-protobuf', '~> 3.7.1'
|
||||
+gem 'google-protobuf', '~> 3.7', '>=3.7.1'
|
||||
+gem 'google-protobuf', '~> 3.7', '>= 3.7.1'
|
||||
|
||||
-gem 'toml-rb', '~> 1.0.0', require: false
|
||||
+gem 'toml-rb', '~> 1.0', require: false
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
|
|||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -288,7 +288,6 @@
|
||||
@@ -289,7 +289,6 @@
|
||||
gem 'rails-i18n', '~> 5.1'
|
||||
gem 'gettext_i18n_rails', '~> 1.8'
|
||||
gem 'gettext_i18n_rails_js', '~> 1.3'
|
||||
|
|
@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
|
|||
|
||||
gem 'batch-loader', '~> 1.4'
|
||||
|
||||
@@ -310,21 +309,6 @@
|
||||
@@ -314,21 +313,6 @@
|
||||
gem 'raindrops', '~> 0.18'
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -14,8 +14,9 @@
|
||||
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
|
||||
gem 'default_value_for', '~> 3.2'
|
||||
|
||||
# Supported DBs
|
||||
-gem 'mysql2', '~> 0.4.10', group: :mysql
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -310,7 +310,7 @@
|
||||
@@ -314,7 +314,7 @@
|
||||
gem 'raindrops', '~> 0.18'
|
||||
end
|
||||
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
|
||||
gem 'bootsnap', '~> 1.4'
|
||||
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
|
||||
gem 'pry-byebug', '~> 3.5', '>=3.5.1', platform: :mri
|
||||
@@ -364,9 +364,9 @@
|
||||
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
|
||||
@@ -368,9 +368,9 @@
|
||||
gem 'simple_po_parser', '~> 1.1', '>=1.1.2', require: false
|
||||
|
||||
gem 'timecop', '~> 0.8.0'
|
||||
|
|
|
|||
2
debian/patches/0290-skip-peek-mysql2.patch
vendored
2
debian/patches/0290-skip-peek-mysql2.patch
vendored
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -295,7 +295,6 @@
|
||||
@@ -296,7 +296,6 @@
|
||||
# Perf bar
|
||||
gem 'peek', '~> 1.0', '>= 1.0.1'
|
||||
gem 'peek-gc', '~> 0.0.2'
|
||||
|
|
|
|||
2
debian/patches/0340-relax-httparty.patch
vendored
2
debian/patches/0340-relax-httparty.patch
vendored
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -175,7 +175,7 @@
|
||||
@@ -176,7 +176,7 @@
|
||||
gem 'fugit', '~> 1.2', '>=1.2.1'
|
||||
|
||||
# HTTP requests
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -122,7 +122,6 @@
|
||||
@@ -123,7 +123,6 @@
|
||||
# Markdown and HTML processing
|
||||
gem 'html-pipeline', '~> 2.8'
|
||||
gem 'deckar01-task_list', '2.2'
|
||||
-gem 'gitlab-markup', '~> 1.7'
|
||||
gem 'github-markup', '~> 1.7', require: 'github/markup'
|
||||
gem 'commonmarker', '~> 0.17'
|
||||
gem 'RedCloth', '~> 4.3', '>=4.3.2'
|
||||
gem 'RedCloth', '~> 4.3', '>= 4.3.2'
|
||||
|
|
|
|||
2
debian/patches/0440-remove-puma.patch
vendored
2
debian/patches/0440-remove-puma.patch
vendored
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -152,12 +152,6 @@
|
||||
@@ -153,12 +153,6 @@
|
||||
gem 'unicorn-worker-killer', '~> 0.4.4'
|
||||
end
|
||||
|
||||
|
|
|
|||
4
debian/patches/0450-remove-bullet.patch
vendored
4
debian/patches/0450-remove-bullet.patch
vendored
|
|
@ -1,10 +1,10 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -304,7 +304,6 @@
|
||||
@@ -308,7 +308,6 @@
|
||||
|
||||
if ENV["INCLUDE_TEST_DEPENDS"] == "true"
|
||||
gem 'bootsnap', '~> 1.4'
|
||||
- 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
|
||||
gem 'pry-rails', '~> 0.3.4'
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
- "gettext-extractor": "^3.4.3",
|
||||
- "gettext-extractor-vue": "^4.0.2",
|
||||
- "graphql-tag": "^2.10.0",
|
||||
- "istanbul": "^0.4.5",
|
||||
- "jasmine-core": "^2.9.0",
|
||||
- "jasmine-diff": "^0.1.3",
|
||||
- "jasmine-jquery": "^2.1.1",
|
||||
|
|
@ -50,7 +49,8 @@
|
|||
- "nodemon": "^1.18.9",
|
||||
- "pixelmatch": "^4.0.2",
|
||||
- "postcss": "^7.0.14",
|
||||
- "prettier": "1.16.4",
|
||||
- "prettier": "1.18.2",
|
||||
- "readdir-enhanced": "^2.2.4",
|
||||
- "stylelint": "^9.10.1",
|
||||
- "stylelint-config-recommended": "^2.1.0",
|
||||
- "stylelint-scss": "^3.5.4",
|
||||
|
|
|
|||
28
debian/patches/0620-pid-log-paths.patch
vendored
28
debian/patches/0620-pid-log-paths.patch
vendored
|
|
@ -14,20 +14,6 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13415
|
|||
warn()
|
||||
{
|
||||
echo "$@" 1>&2
|
||||
--- a/bin/web
|
||||
+++ b/bin/web
|
||||
@@ -12,6 +12,11 @@
|
||||
unicorn_config="$app_root/config/unicorn.rb"
|
||||
unicorn_cmd="bundle exec unicorn_rails -c $unicorn_config -E $RAILS_ENV"
|
||||
|
||||
+# Read configuration variable file if it is present
|
||||
+test -f /etc/default/gitlab && . /etc/default/gitlab
|
||||
+
|
||||
+unicorn_pidfile=${web_server_pid_path}
|
||||
+
|
||||
get_unicorn_pid()
|
||||
{
|
||||
local pid=$(cat $unicorn_pidfile)
|
||||
--- a/bin/mail_room
|
||||
+++ b/bin/mail_room
|
||||
@@ -7,6 +7,11 @@
|
||||
|
|
@ -42,3 +28,17 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13415
|
|||
get_mail_room_pid()
|
||||
{
|
||||
local pid=$(cat $mail_room_pidfile)
|
||||
--- a/bin/web_unicorn
|
||||
+++ b/bin/web_unicorn
|
||||
@@ -7,6 +7,11 @@
|
||||
unicorn_config="$app_root/config/unicorn.rb"
|
||||
unicorn_cmd="bundle exec unicorn_rails -c $unicorn_config -E $RAILS_ENV"
|
||||
|
||||
+# Read configuration variable file if it is present
|
||||
+test -f /etc/default/gitlab && . /etc/default/gitlab
|
||||
+
|
||||
+unicorn_pidfile=${web_server_pid_path}
|
||||
+
|
||||
get_unicorn_pid()
|
||||
{
|
||||
local pid=$(cat $unicorn_pidfile)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
--- a/config/settings.rb
|
||||
+++ b/config/settings.rb
|
||||
@@ -1,7 +1,7 @@
|
||||
require 'settingslogic'
|
||||
@@ -7,7 +7,7 @@
|
||||
require_dependency File.expand_path('../lib/gitlab', __dir__)
|
||||
|
||||
class Settings < Settingslogic
|
||||
- source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('..', __dir__)).join('config/gitlab.yml') }
|
||||
|
|
|
|||
20
debian/patches/0680-rails-5-migrations.patch
vendored
20
debian/patches/0680-rails-5-migrations.patch
vendored
|
|
@ -1,20 +0,0 @@
|
|||
--- a/db/migrate/20181027114222_add_first_day_of_week_to_user_preferences.rb
|
||||
+++ b/db/migrate/20181027114222_add_first_day_of_week_to_user_preferences.rb
|
||||
@@ -1,6 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
-class AddFirstDayOfWeekToUserPreferences < ActiveRecord::Migration
|
||||
+class AddFirstDayOfWeekToUserPreferences < ActiveRecord::Migration[4.2]
|
||||
DOWNTIME = false
|
||||
|
||||
def change
|
||||
--- a/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb
|
||||
+++ b/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb
|
||||
@@ -1,6 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
-class AddFirstDayOfWeekToApplicationSettings < ActiveRecord::Migration
|
||||
+class AddFirstDayOfWeekToApplicationSettings < ActiveRecord::Migration[4.2]
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
disable_ddl_transaction!
|
||||
|
||||
181
debian/patches/0685-bump-fog.patch
vendored
181
debian/patches/0685-bump-fog.patch
vendored
|
|
@ -1,181 +0,0 @@
|
|||
From 4193e3d47543abfd533f5bc73753a2d31ab9eb22 Mon Sep 17 00:00:00 2001
|
||||
From: Stan Hu <stanhu@gmail.com>
|
||||
Date: Wed, 23 Jan 2019 22:17:31 -0800
|
||||
Subject: [PATCH 1/6] Bump fog-aws to 3.3.0 and associated dependencies
|
||||
|
||||
Fixes issue with AWS V4 signatures not working with Ceph S3:
|
||||
https://github.com/fog/fog-aws/issues/462
|
||||
---
|
||||
Gemfile | 12 ++---
|
||||
Gemfile.lock | 47 ++++++++++---------
|
||||
.../concerns/send_file_upload_spec.rb | 2 +-
|
||||
3 files changed, 31 insertions(+), 30 deletions(-)
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -95,13 +95,13 @@
|
||||
gem 'mini_magick'
|
||||
|
||||
# for backups
|
||||
-gem 'fog-aws', '~> 2.0', '>= 2.0.1'
|
||||
-gem 'fog-core', '~> 1.44'
|
||||
-gem 'fog-google', '~> 1.7', '>= 1.7.1'
|
||||
-gem 'fog-local', '~> 0.3'
|
||||
-gem 'fog-openstack', '~> 0.1'
|
||||
+gem 'fog-aws', '~> 3.3'
|
||||
+gem 'fog-core', '~> 2.1'
|
||||
+gem 'fog-google', '~> 1.8'
|
||||
+gem 'fog-local', '~> 0.6'
|
||||
+gem 'fog-openstack', '~> 1.0'
|
||||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
-gem 'fog-aliyun', '~> 0.2.0'
|
||||
+gem 'fog-aliyun', '~> 0.3'
|
||||
|
||||
# for Google storage
|
||||
gem 'google-api-client', '~> 0.23'
|
||||
--- a/Gemfile.lock
|
||||
+++ b/Gemfile.lock
|
||||
@@ -217,32 +217,33 @@
|
||||
flowdock (0.7.1)
|
||||
httparty (~> 0.7)
|
||||
multi_json
|
||||
- fog-aliyun (0.2.0)
|
||||
- fog-core (~> 1.27)
|
||||
- fog-json (~> 1.0)
|
||||
+ fog-aliyun (0.3.3)
|
||||
+ fog-core
|
||||
+ fog-json
|
||||
ipaddress (~> 0.8)
|
||||
xml-simple (~> 1.1)
|
||||
- fog-aws (2.0.1)
|
||||
- fog-core (~> 1.38)
|
||||
- fog-json (~> 1.0)
|
||||
+ fog-aws (3.3.0)
|
||||
+ fog-core (~> 2.1)
|
||||
+ fog-json (~> 1.1)
|
||||
fog-xml (~> 0.1)
|
||||
ipaddress (~> 0.8)
|
||||
- fog-core (1.45.0)
|
||||
+ fog-core (2.1.0)
|
||||
builder
|
||||
excon (~> 0.58)
|
||||
formatador (~> 0.2)
|
||||
- fog-google (1.7.1)
|
||||
- fog-core
|
||||
- fog-json
|
||||
- fog-xml
|
||||
+ mime-types
|
||||
+ fog-google (1.8.2)
|
||||
+ fog-core (<= 2.1.0)
|
||||
+ fog-json (~> 1.2)
|
||||
+ fog-xml (~> 0.1.0)
|
||||
google-api-client (~> 0.23.0)
|
||||
- fog-json (1.0.2)
|
||||
- fog-core (~> 1.0)
|
||||
+ fog-json (1.2.0)
|
||||
+ fog-core
|
||||
multi_json (~> 1.10)
|
||||
- fog-local (0.3.1)
|
||||
- fog-core (~> 1.27)
|
||||
- fog-openstack (0.1.21)
|
||||
- fog-core (>= 1.40)
|
||||
+ fog-local (0.6.0)
|
||||
+ fog-core (>= 1.27, < 3.0)
|
||||
+ fog-openstack (1.0.8)
|
||||
+ fog-core (~> 2.1)
|
||||
fog-json (>= 1.0)
|
||||
ipaddress (>= 0.8)
|
||||
fog-rackspace (0.1.1)
|
||||
@@ -1004,12 +1005,12 @@
|
||||
flipper-active_record (~> 0.13.0)
|
||||
flipper-active_support_cache_store (~> 0.13.0)
|
||||
flowdock (~> 0.7)
|
||||
- fog-aliyun (~> 0.2.0)
|
||||
- fog-aws (~> 2.0.1)
|
||||
- fog-core (~> 1.44)
|
||||
- fog-google (~> 1.7.1)
|
||||
- fog-local (~> 0.3)
|
||||
- fog-openstack (~> 0.1)
|
||||
+ fog-aliyun (~> 0.3)
|
||||
+ fog-aws (~> 3.3)
|
||||
+ fog-core (= 2.1.0)
|
||||
+ fog-google (~> 1.8)
|
||||
+ fog-local (~> 0.6)
|
||||
+ fog-openstack (~> 1.0)
|
||||
fog-rackspace (~> 0.1.1)
|
||||
font-awesome-rails (~> 4.7)
|
||||
foreman (~> 0.84.0)
|
||||
--- a/spec/controllers/concerns/send_file_upload_spec.rb
|
||||
+++ b/spec/controllers/concerns/send_file_upload_spec.rb
|
||||
@@ -112,7 +112,7 @@
|
||||
|
||||
it 'sends a file with a custom type' do
|
||||
headers = double
|
||||
- expected_headers = %r(response-content-disposition=attachment%3B%20filename%3D%22test.js%22%3B%20filename%2A%3DUTF-8%27%27test.js&response-content-type=application/ecmascript)
|
||||
+ expected_headers = /response-content-disposition=attachment%3B%20filename%3D%22test.js%22%3B%20filename%2A%3DUTF-8%27%27test.js&response-content-type=application%2Fecmascript/
|
||||
expect(Gitlab::Workhorse).to receive(:send_url).with(expected_headers).and_call_original
|
||||
expect(headers).to receive(:store).with(Gitlab::Workhorse::SEND_DATA_HEADER, /^send-url:/)
|
||||
|
||||
--- /dev/null
|
||||
+++ b/config/initializers/fog_core_patch.rb
|
||||
@@ -0,0 +1,52 @@
|
||||
+# frozen_string_literal: true
|
||||
+#
|
||||
+# fog-core v2 changed the namespace format:
|
||||
+#
|
||||
+# Old: Fog::<service>::<provider> (e.g. Fog::Storage::AWS).
|
||||
+# New: Fog::<provider>::<service> (e.g. Fog::AWS::Storage)
|
||||
+#
|
||||
+# To preserve backwards compatibility, fog-core v2.1.0 tries to load the
|
||||
+# old schema first, but falls back to the older version if that
|
||||
+# fails. This creates misleading warnings with fog-aws. See
|
||||
+# https://github.com/fog/fog-aws/issues/504#issuecomment-468067991 for
|
||||
+# more details.
|
||||
+#
|
||||
+# fog-core v2.1.2 reverses the load order
|
||||
+# (https://github.com/fog/fog-core/pull/229), which works for fog-aws
|
||||
+# but causes a stream of deprecation warnings for fog-google.
|
||||
+# fog-google locked the dependency on fog-core v2.1.0 as a result
|
||||
+# (https://github.com/fog/fog-google/issues/421) until the new namespace
|
||||
+# is supported.
|
||||
+#
|
||||
+# Since we currently have some Fog gems that have not been updated, this
|
||||
+# monkey patch makes a smarter decision about which namespace to try
|
||||
+# first. This squelches a significant number of warning messages.
|
||||
+#
|
||||
+# Since this patch is mostly cosmetic, it can be removed safely at any
|
||||
+# time, but it's probably best to wait until the following issues are
|
||||
+# closed:
|
||||
+#
|
||||
+# fog-google: https://github.com/fog/fog-google/issues/421
|
||||
+# fog-rackspace: https://github.com/fog/fog-rackspace/issues/29
|
||||
+# fog-aliyun: https://github.com/fog/fog-aliyun/issues/23
|
||||
+module Fog
|
||||
+ module ServicesMixin
|
||||
+ # Gems that have not yet updated with the new fog-core namespace
|
||||
+ LEGACY_FOG_PROVIDERS = %w(google rackspace aliyun).freeze
|
||||
+
|
||||
+ def service_provider_constant(service_name, provider_name)
|
||||
+ args = service_provider_search_args(service_name, provider_name)
|
||||
+ Fog.const_get(args.first).const_get(*const_get_args(args.second))
|
||||
+ rescue NameError # Try to find the constant from in an alternate location
|
||||
+ Fog.const_get(args.second).const_get(*const_get_args(args.first))
|
||||
+ end
|
||||
+
|
||||
+ def service_provider_search_args(service_name, provider_name)
|
||||
+ if LEGACY_FOG_PROVIDERS.include?(provider_name.downcase)
|
||||
+ [service_name, provider_name]
|
||||
+ else
|
||||
+ [provider_name, service_name]
|
||||
+ end
|
||||
+ end
|
||||
+ end
|
||||
+end
|
||||
--- /dev/null
|
||||
+++ b/changelogs/unreleased/sh-bump-fog-gem.yml
|
||||
@@ -0,0 +1,5 @@
|
||||
+---
|
||||
+title: Fixes issue with AWS V4 signatures not working with some S3 providers
|
||||
+merge_request: 21788
|
||||
+author:
|
||||
+type: fixed
|
||||
20
debian/patches/0686-rails-5.1-embed.patch
vendored
20
debian/patches/0686-rails-5.1-embed.patch
vendored
|
|
@ -1,20 +0,0 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -1,6 +1,16 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
-gem 'rails', '5.1.7'
|
||||
+gem "rails", "5.1.7", path: 'vendor/gems/rails-5.1.7'
|
||||
+gem "railties", "5.1.7", path: 'vendor/gems/railties-5.1.7'
|
||||
+gem "activerecord", "5.1.7", path: 'vendor/gems/activerecord-5.1.7'
|
||||
+gem "activesupport", "5.1.7", path: 'vendor/gems/activesupport-5.1.7'
|
||||
+gem "activemodel", "5.1.7", path: 'vendor/gems/activemodel-5.1.7'
|
||||
+gem "activejob", "5.1.7", path: 'vendor/gems/activejob-5.1.7'
|
||||
+gem "actioncable", "5.1.7", path: 'vendor/gems/actioncable-5.1.7'
|
||||
+gem "actionmailer", "5.1.7", path: 'vendor/gems/actionmailer-5.1.7'
|
||||
+gem "actionpack", "5.1.7", path: 'vendor/gems/actionpack-5.1.7'
|
||||
+gem "actionview", "5.1.7", path: 'vendor/gems/actionview-5.1.7'
|
||||
+gem "arel", "8.0.0", path: 'vendor/gems/arel-8.0.0'
|
||||
|
||||
# Improves copy-on-write performance for MRI
|
||||
gem 'nakayoshi_fork', '~> 0.0.4'
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -44,7 +44,8 @@
|
||||
gem 'omniauth-facebook', '~> 4.0'
|
||||
gem 'omniauth-github', '~> 1.3'
|
||||
gem 'omniauth-gitlab', '~> 1.0', '>=1.0.2'
|
||||
-gem 'omniauth-google-oauth2', '~> 0.6.0'
|
||||
+gem 'omniauth-google-oauth2', '0.6.1', path: 'vendor/gems/omniauth-google-oauth2-0.6.1'
|
||||
+
|
||||
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
|
||||
gem 'omniauth-oauth2-generic', '~> 0.2.2'
|
||||
gem 'omniauth-saml', '~> 1.10'
|
||||
@@ -56,7 +57,7 @@
|
||||
gem "omniauth-ultraauth", '~> 0.0.2'
|
||||
gem 'omniauth-salesforce', '~> 1.0', '>=1.0.5'
|
||||
gem 'rack-oauth2', '~> 1.9', '>=1.9.3'
|
||||
-gem 'jwt', '~> 2.1'
|
||||
+gem 'jwt', '2.1', path: 'vendor/gems/jwt-2.1.0'
|
||||
|
||||
# Spam and anti-bot protection
|
||||
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
|
||||
4
debian/patches/0710-use-yarnpkg.patch
vendored
4
debian/patches/0710-use-yarnpkg.patch
vendored
|
|
@ -29,8 +29,8 @@ Yarn executable in debian is yarnpkg
|
|||
|
||||
desc 'Install Node dependencies with Yarn'
|
||||
task install: ['yarn:available'] do
|
||||
- unless system('yarn install --pure-lockfile --ignore-engines')
|
||||
+ unless system('yarnpkg install --pure-lockfile --ignore-engines')
|
||||
- unless system('yarn install --pure-lockfile --ignore-engines --prefer-offline')
|
||||
+ unless system('yarnpkg install --pure-lockfile --ignore-engines --prefer-offline')
|
||||
abort 'Error: Unable to install node modules.'.color(:red)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Author: Utkarsh Gupta <guptautkarsh2102@gmail.com>
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -77,6 +77,7 @@
|
||||
@@ -84,6 +84,7 @@
|
||||
"fuzzaldrin-plus": "^0.5.0",
|
||||
"glob": "^7.1.2",
|
||||
"graphql": "^14.0.2",
|
||||
|
|
|
|||
98
debian/patches/0740-use-packaged-modules.patch
vendored
98
debian/patches/0740-use-packaged-modules.patch
vendored
|
|
@ -1,78 +1,6 @@
|
|||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -45,32 +45,12 @@
|
||||
"apollo-link-batch-http": "^1.2.11",
|
||||
"apollo-upload-client": "^10.0.0",
|
||||
"at.js": "^1.5.4",
|
||||
- "autosize": "^4.0.0",
|
||||
- "axios": "^0.17.1",
|
||||
"babel-loader": "^8.0.5",
|
||||
- "bootstrap": "4.3.1",
|
||||
- "brace-expansion": "^1.1.8",
|
||||
- "cache-loader": "^2.0.1",
|
||||
- "chart.js": "2.7.2",
|
||||
"classlist-polyfill": "^1.2.0",
|
||||
"clipboard": "^1.7.1",
|
||||
"codesandbox-api": "^0.0.20",
|
||||
"compression-webpack-plugin": "^2.0.0",
|
||||
- "core-js": "^3.1.3",
|
||||
"cropper": "^2.3.0",
|
||||
- "css-loader": "^1.0.0",
|
||||
- "d3": "^4.13.0",
|
||||
- "d3-array": "^1.2.1",
|
||||
- "d3-axis": "^1.0.8",
|
||||
- "d3-brush": "^1.0.4",
|
||||
- "d3-ease": "^1.0.3",
|
||||
- "d3-scale": "^1.0.7",
|
||||
- "d3-selection": "^1.2.0",
|
||||
- "d3-shape": "^1.2.0",
|
||||
- "d3-time": "^1.0.8",
|
||||
- "d3-time-format": "^2.1.1",
|
||||
- "d3-transition": "^1.1.1",
|
||||
- "dateformat": "^3.0.3",
|
||||
"deckar01-task_list": "^2.2.0",
|
||||
"diff": "^3.4.0",
|
||||
"document-register-element": "1.13.1",
|
||||
@@ -78,38 +58,21 @@
|
||||
"echarts": "^4.2.0-rc.2",
|
||||
"emoji-regex": "^7.0.3",
|
||||
"emoji-unicode-version": "^0.2.1",
|
||||
- "exports-loader": "^0.7.0",
|
||||
- "file-loader": "^3.0.1",
|
||||
"formdata-polyfill": "^3.0.11",
|
||||
- "fuzzaldrin-plus": "^0.5.0",
|
||||
- "glob": "^7.1.2",
|
||||
"graphql": "^14.0.2",
|
||||
"graphql-tag": "^2.0.0",
|
||||
- "imports-loader": "^0.8.0",
|
||||
- "jed": "^1.1.1",
|
||||
"jest-transform-graphql": "^2.1.0",
|
||||
- "jquery": "^3.2.1",
|
||||
- "jquery-ujs": "1.2.2",
|
||||
"jquery.caret": "^0.3.1",
|
||||
- "jquery.waitforimages": "^2.2.0",
|
||||
- "js-cookie": "^2.1.3",
|
||||
- "jszip": "^3.1.3",
|
||||
- "jszip-utils": "^0.0.2",
|
||||
"katex": "^0.10.0",
|
||||
"marked": "^0.3.12",
|
||||
"mermaid": "^8.0.0",
|
||||
"monaco-editor": "^0.15.6",
|
||||
"monaco-editor-webpack-plugin": "^1.7.0",
|
||||
- "mousetrap": "^1.4.6",
|
||||
"pdfjs-dist": "^2.0.943",
|
||||
- "pikaday": "^1.6.1",
|
||||
- "popper.js": "^1.14.7",
|
||||
"prismjs": "^1.6.0",
|
||||
"prosemirror-markdown": "^1.3.0",
|
||||
"prosemirror-model": "^1.6.4",
|
||||
"raphael": "^2.2.7",
|
||||
- "raven-js": "^3.22.1",
|
||||
- "raw-loader": "^1.0.0",
|
||||
"sanitize-html": "^1.16.1",
|
||||
"select2": "3.5.2-browserify",
|
||||
"sha1": "^1.1.1",
|
||||
@@ -121,28 +84,17 @@
|
||||
@@ -121,28 +121,17 @@
|
||||
"stylelint-error-string-formatter": "1.0.2",
|
||||
"svg4everybody": "2.1.9",
|
||||
"three": "^0.84.0",
|
||||
|
|
@ -101,17 +29,6 @@
|
|||
"xterm": "^3.5.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
--- a/app/assets/stylesheets/application.scss
|
||||
+++ b/app/assets/stylesheets/application.scss
|
||||
@@ -12,7 +12,7 @@
|
||||
// If you need to add unique style that should affect only one page - use pages/
|
||||
// directory.
|
||||
@import "../../../node_modules/at.js/dist/css/jquery.atwho";
|
||||
-@import "../../../node_modules/pikaday/scss/pikaday";
|
||||
+@import "/usr/lib/nodejs/pikaday/scss/pikaday";
|
||||
@import "../../../node_modules/dropzone/dist/basic";
|
||||
@import "../../../node_modules/select2/select2";
|
||||
|
||||
--- a/config/webpack.config.js
|
||||
+++ b/config/webpack.config.js
|
||||
@@ -5,7 +5,6 @@
|
||||
|
|
@ -152,12 +69,13 @@
|
|||
- }),
|
||||
-
|
||||
new webpack.DefinePlugin({
|
||||
// This one is used to define window.gon.ee and other things properly in tests:
|
||||
'process.env.IS_GITLAB_EE': JSON.stringify(IS_EE),
|
||||
}),
|
||||
@@ -347,5 +336,5 @@
|
||||
devtool: NO_SOURCEMAPS ? false : devtool,
|
||||
@@ -351,6 +340,7 @@
|
||||
|
||||
// sqljs requires fs
|
||||
- node: { fs: 'empty' },
|
||||
+ node: { fs: 'empty', Buffer: "mock" },
|
||||
node: {
|
||||
fs: 'empty', // sqljs requires fs
|
||||
+ Buffer: 'mock',
|
||||
setImmediate: false,
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -286,7 +286,7 @@
|
||||
@@ -276,7 +276,7 @@
|
||||
gem 'premailer-rails', '~> 1.9', '>=1.9.7'
|
||||
|
||||
# LabKit: Tracing and Correlation
|
||||
|
|
|
|||
94
debian/patches/0850-bump-asciidoctor.patch
vendored
94
debian/patches/0850-bump-asciidoctor.patch
vendored
|
|
@ -1,94 +0,0 @@
|
|||
Description: <short summary of the patch>
|
||||
Author: Utkarsh Gupta <guptautkarsh2102@gmail.com>
|
||||
Origin: https://gitlab.com/gitlab-org/gitlab-foss/commit/c2ef8589e3b010dcf27adb31dea3ffe72d7a3f6d
|
||||
Bug-Debian: https://bugs.debian.org/940814
|
||||
Last-Update: 2019-09-16
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -140,9 +140,9 @@
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
-gem 'asciidoctor', '~> 1.5', '>=1.5.8'
|
||||
+gem 'asciidoctor', '~> 2.0', '>=2.0.10'
|
||||
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
|
||||
-gem 'asciidoctor-plantuml', '0.0.8'
|
||||
+gem 'asciidoctor-plantuml', '0.0.9'
|
||||
gem 'rouge', '~> 3.1'
|
||||
gem 'truncato', '~> 0.7.11'
|
||||
gem 'bootstrap_form', '~> 4.2'
|
||||
--- a/Gemfile.lock
|
||||
+++ b/Gemfile.lock
|
||||
@@ -66,11 +66,11 @@
|
||||
faraday_middleware (~> 0.9)
|
||||
faraday_middleware-multi_json (~> 0.0)
|
||||
oauth2 (~> 1.0)
|
||||
- asciidoctor (1.5.8)
|
||||
+ asciidoctor (2.0.10)
|
||||
asciidoctor-include-ext (0.3.1)
|
||||
asciidoctor (>= 1.5.6, < 3.0.0)
|
||||
- asciidoctor-plantuml (0.0.8)
|
||||
- asciidoctor (~> 1.5)
|
||||
+ asciidoctor-plantuml (0.0.9)
|
||||
+ asciidoctor (>= 1.5.6, < 3.0.0)
|
||||
ast (2.4.0)
|
||||
atomic (1.1.99)
|
||||
attr_encrypted (3.1.0)
|
||||
@@ -1025,9 +1025,9 @@
|
||||
akismet (~> 2.0)
|
||||
apollo_upload_server (~> 2.0.0.beta3)
|
||||
asana (~> 0.8.1)
|
||||
- asciidoctor (~> 1.5.8)
|
||||
+ asciidoctor (~> 2.0.10)
|
||||
asciidoctor-include-ext (~> 0.3.1)
|
||||
- asciidoctor-plantuml (= 0.0.8)
|
||||
+ asciidoctor-plantuml (= 0.0.9)
|
||||
attr_encrypted (~> 3.1.0)
|
||||
awesome_print
|
||||
babosa (~> 1.0.2)
|
||||
--- a/lib/gitlab/asciidoc/html5_converter.rb
|
||||
+++ b/lib/gitlab/asciidoc/html5_converter.rb
|
||||
@@ -1,22 +1,19 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require 'asciidoctor'
|
||||
-require 'asciidoctor/converter/html5'
|
||||
|
||||
module Gitlab
|
||||
module Asciidoc
|
||||
- class Html5Converter < Asciidoctor::Converter::Html5Converter
|
||||
- extend Asciidoctor::Converter::Config
|
||||
-
|
||||
+ class Html5Converter < (Asciidoctor::Converter.for 'html5')
|
||||
register_for 'gitlab_html5'
|
||||
|
||||
- def stem(node)
|
||||
+ def convert_stem(node)
|
||||
return super unless node.style.to_sym == :latexmath
|
||||
|
||||
%(<pre#{id_attribute(node)} data-math-style="display"><code>#{node.content}</code></pre>)
|
||||
end
|
||||
|
||||
- def inline_quoted(node)
|
||||
+ def convert_inline_quoted(node)
|
||||
return super unless node.type.to_sym == :latexmath
|
||||
|
||||
%(<code#{id_attribute(node)} data-math-style="inline">#{node.text}</code>)
|
||||
--- /dev/null
|
||||
+++ b/Gemfile.rej
|
||||
@@ -0,0 +1,14 @@
|
||||
+--- Gemfile
|
||||
++++ Gemfile
|
||||
+@@ -129,9 +129,9 @@ gem 'rdoc', '~> 6.0'
|
||||
+ gem 'org-ruby', '~> 0.9.12'
|
||||
+ gem 'creole', '~> 0.5.0'
|
||||
+ gem 'wikicloth', '0.8.1'
|
||||
+-gem 'asciidoctor', '~> 1.5.8'
|
||||
++gem 'asciidoctor', '~> 2.0.10'
|
||||
+ gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
|
||||
+-gem 'asciidoctor-plantuml', '0.0.8'
|
||||
++gem 'asciidoctor-plantuml', '0.0.9'
|
||||
+ gem 'rouge', '~> 3.1'
|
||||
+ gem 'truncato', '~> 0.7.11'
|
||||
+ gem 'bootstrap_form', '~> 4.2.0'
|
||||
3
debian/patches/series
vendored
3
debian/patches/series
vendored
|
|
@ -17,12 +17,9 @@
|
|||
0640-relax-ruby-version.patch
|
||||
0660-fix-gitlab-yml-path.patch
|
||||
0670-allow-doorkeepr-4_3.patch
|
||||
0686-rails-5.1-embed.patch
|
||||
0689-jwt-and-omniauth-google-oauth2.patch
|
||||
0690-debian-usage-ping.patch
|
||||
0700-add-salsa-link-to-help.patch
|
||||
0710-use-yarnpkg.patch
|
||||
0730-install-graphql-tag.patch
|
||||
0740-use-packaged-modules.patch
|
||||
0840-embed-gitlab-labkit.patch
|
||||
0850-bump-asciidoctor.patch
|
||||
|
|
|
|||
Loading…
Reference in a new issue