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

Refresh patches

Browse source
This commit is contained in:
Sruthi Chandran 2020-01-01 14:36:02 +05:30
parent 62661f24ee
commit d808028c80
16 changed files with 78 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ gitlab Gemfile
# Supported DBs
gem 'pg', '~> 1.1'
@@ -28,25 +28,25 @@
@@ -29,25 +29,25 @@
gem 'doorkeeper', '~> 4.3'
gem 'doorkeeper-openid_connect', '~> 1.5'
gem 'omniauth', '~> 1.8'
@ -50,7 +50,7 @@ gitlab Gemfile
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
@@ -57,41 +57,41 @@
@@ -58,41 +58,41 @@
gem 'invisible_captcha', '~> 0.12.1'
# Two-factor authentication
@ -104,16 +104,16 @@ gitlab Gemfile
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
# Disable strong_params so that Mash does not respond to :permitted?
@@ -101,7 +101,7 @@
@@ -102,7 +102,7 @@
gem 'kaminari', '~> 1.0'
# HAML
-gem 'hamlit', '~> 2.8.8'
+gem 'hamlit', '~> 2.8', '>= 2.8.8'
-gem 'hamlit', '~> 2.11.0'
+gem 'hamlit', '~> 2.11'
# Files attachments
gem 'carrierwave', '~> 1.3'
@@ -111,7 +111,7 @@
@@ -112,7 +112,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.
@ -122,7 +122,7 @@ gitlab Gemfile
gem 'fog-google', '~> 1.9'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
@@ -125,47 +125,47 @@
@@ -126,47 +126,47 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -138,14 +138,14 @@ gitlab Gemfile
gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'html-pipeline', '~> 2.12'
-gem 'deckar01-task_list', '2.2.1'
-gem 'gitlab-markup', '~> 1.7.0'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'deckar01-task_list', '~> 2.2', '>= 2.2.1'
+gem 'gitlab-markup', '~> 1.7'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.17'
gem 'commonmarker', '~> 0.20'
-gem 'RedCloth', '~> 4.3.2'
+gem 'RedCloth', '~> 4.3', '>= 4.3.2'
gem 'rdoc', '~> 6.0'
@ -161,7 +161,7 @@ gitlab Gemfile
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.5'
+gem 'bootstrap_form', '~> 4.2'
+gem 'bootstrap_form', '~> 4.2', '>= 4.2.0'
+gem 'nokogiri', '~> 1.10', '>= 1.10.5'
gem 'escape_utils', '~> 1.1'
@ -183,7 +183,7 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -182,13 +182,13 @@
@@ -183,13 +183,13 @@
gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
@ -200,7 +200,7 @@ gitlab Gemfile
# HTTP requests
gem 'httparty', '~> 0.16.4'
@@ -200,14 +200,14 @@
@@ -201,14 +201,14 @@
gem 'ruby-progressbar'
# GitLab settings
@ -218,7 +218,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1'
@@ -220,13 +220,13 @@
@@ -221,13 +221,13 @@
gem 'connection_pool', '~> 2.0'
# Redis session store
@ -234,7 +234,7 @@ gitlab Gemfile
# Jira integration
gem 'jira-ruby', '~> 1.7'
@@ -236,7 +236,7 @@
@@ -237,7 +237,7 @@
gem 'flowdock', '~> 0.7'
# Slack integration
@ -243,7 +243,7 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -248,11 +248,11 @@
@@ -249,11 +249,11 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -257,7 +257,7 @@ gitlab Gemfile
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -261,7 +261,7 @@
@@ -262,7 +262,7 @@
gem 'licensee', '~> 8.9'
# Ace editor
@ -266,7 +266,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
@@ -279,10 +279,10 @@
@@ -280,10 +280,10 @@
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -280,7 +280,7 @@ gitlab Gemfile
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2'
@@ -292,12 +292,12 @@
@@ -293,12 +293,12 @@
gem "gitlab-license", "~> 1.0"
# Protect against bruteforcing
@ -295,7 +295,7 @@ gitlab Gemfile
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.5'
@@ -305,11 +305,11 @@
@@ -306,11 +306,11 @@
# I18n
gem 'ruby_parser', '~> 3.8', require: false
gem 'rails-i18n', '~> 5.1'
@ -309,8 +309,17 @@ gitlab Gemfile
+gem 'batch-loader', '~> 1.4'
# Perf bar
# https://gitlab.com/gitlab-org/gitlab/issues/13996
@@ -431,11 +431,11 @@
gem 'peek', '~> 1.1'
@@ -422,7 +422,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
-gem 'ruby-prof', '~> 1.0.0'
+gem 'ruby-prof', '~> 1.0'
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
gem 'benchmark-memory', '~> 0.1', require: false
@@ -432,11 +432,11 @@
gem 'oauth2', '~> 1.4'
# Health check
@ -325,12 +334,12 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -451,13 +451,13 @@
@@ -452,13 +452,13 @@
end
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 1.70.0'
+gem 'gitaly', '~> 1.70'
-gem 'gitaly', '~> 1.73.0'
+gem 'gitaly', '~> 1.73'
-gem 'grpc', '~> 1.24.0'
+gem 'grpc', '~> 1.24'
@ -343,3 +352,9 @@ gitlab Gemfile
# Feature toggles
gem 'flipper', '~> 0.17.1'
@@ -476,4 +476,4 @@
# Countries list
gem 'countries', '~> 3.0'
-gem 'retriable', '~> 3.1.2'
+gem 'retriable', '~> 3.1', '>= 3.1.2'

6
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
+++ b/Gemfile
@@ -92,7 +92,6 @@
@@ -93,7 +93,6 @@
# https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
gem 'apollo_upload_server', '>= 2.0.0.beta3'
@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -307,7 +306,6 @@
@@ -308,7 +307,6 @@
gem 'rails-i18n', '~> 5.1'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
@ -38,5 +38,5 @@ Bundler will fail when it can't find these locally
-end
-
group :development, :test do
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri

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

@ -6,10 +6,10 @@
-group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@@ -378,14 +378,10 @@
@@ -369,14 +369,10 @@
gem 'simple_po_parser', '~> 1.1.2', require: false
gem 'timecop', '~> 0.8.0'
@ -21,6 +21,6 @@
-end
-group :test do
gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
gem 'fuubar', '~> 2.2.0'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.5'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -190,7 +190,7 @@
@@ -191,7 +191,7 @@
gem 'fugit', '~> 1.2', '>= 1.2.1'
# HTTP requests

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

@ -1,10 +1,10 @@
--- a/Gemfile
+++ b/Gemfile
@@ -136,7 +136,6 @@
@@ -137,7 +137,6 @@
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '~> 2.2', '>= 2.2.1'
-gem 'gitlab-markup', '~> 1.7'
gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.17'
gem 'commonmarker', '~> 0.20'
gem 'RedCloth', '~> 4.3', '>= 4.3.2'

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

@ -1,12 +1,12 @@
--- a/Gemfile
+++ b/Gemfile
@@ -167,12 +167,6 @@
@@ -168,12 +168,6 @@
gem 'unicorn-worker-killer', '~> 0.4.4'
end
-group :puma do
- gem 'puma', '~> 3.12', require: false
- gem 'puma_worker_killer', require: false
- gem 'gitlab-puma', '~> 4.3.1.gitlab.2', require: false
- gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
- gem 'rack-timeout', require: false
-end
-

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

@ -4,7 +4,7 @@
end
if ENV["INCLUDE_TEST_DEPENDS"] == "true"
- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
- gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -127,7 +127,7 @@
@@ -128,7 +128,7 @@
gem 'seed-fu', '~> 2.3', '>= 2.3.7'
# Search

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -128,7 +128,7 @@
@@ -129,7 +129,7 @@
# Search
gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -131,7 +131,7 @@
@@ -132,7 +132,7 @@
gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3'
gem 'aws-sdk'
@ -8,4 +8,4 @@
+gem 'faraday_middleware-aws-signers-v4', path: 'vendor/gems/faraday-middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'html-pipeline', '~> 2.12'

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -48,9 +48,6 @@
@@ -49,9 +49,6 @@
gem 'rack-oauth2', '~> 1.9', '>= 1.9.3'
gem 'jwt', '~> 2.1'
@ -9,8 +9,8 @@
-
# Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0'
@@ -281,8 +278,6 @@
gem 'akismet', '~> 3.0'
@@ -282,8 +279,6 @@
gem 'request_store', '~> 1.3'
gem 'base32', '~> 0.3.0'

8
debian/patches/0484-relax-asciidoctor-plantuml.patch vendored
View file

@ -10,7 +10,7 @@ Subject: [PATCH 1/2] Update asciidoctor-plantuml 0.0.9 -> 0.0.10
--- a/Gemfile
+++ b/Gemfile
@@ -142,7 +142,7 @@
@@ -143,7 +143,7 @@
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
@ -18,7 +18,7 @@ Subject: [PATCH 1/2] Update asciidoctor-plantuml 0.0.9 -> 0.0.10
+gem 'asciidoctor-plantuml', '~> 0.0.10'
gem 'rouge', '~> 3.11'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2'
gem 'bootstrap_form', '~> 4.2', '>= 4.2.0'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,7 +71,7 @@
@ -30,8 +30,8 @@ Subject: [PATCH 1/2] Update asciidoctor-plantuml 0.0.9 -> 0.0.10
asciidoctor (>= 1.5.6, < 3.0.0)
ast (2.4.0)
atlassian-jwt (0.2.0)
@@ -1122,7 +1122,7 @@
asana (~> 0.8.1)
@@ -1125,7 +1125,7 @@
asana (~> 0.9)
asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1)
- asciidoctor-plantuml (= 0.0.9)

6
debian/patches/0500-set-webpack-root.patch vendored
View file

@ -1,11 +1,11 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -8,7 +8,7 @@
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
@@ -10,7 +10,7 @@
const CopyWebpackPlugin = require('copy-webpack-plugin');
const vendorDllHash = require('./helpers/vendor_dll_hash');
-const ROOT_PATH = path.resolve(__dirname, '..');
+const ROOT_PATH = '/usr/share/gitlab';
const VENDOR_DLL = process.env.WEBPACK_VENDOR_DLL && process.env.WEBPACK_VENDOR_DLL !== 'false';
const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache');
const IS_PRODUCTION = process.env.NODE_ENV === 'production';
const IS_DEV_SERVER = process.env.WEBPACK_DEV_SERVER === 'true';

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

@ -1,11 +1,11 @@
--- a/package.json
+++ b/package.json
@@ -147,64 +147,7 @@
@@ -142,62 +142,6 @@
"xterm": "^3.5.0"
},
"devDependencies": {
- "@babel/plugin-transform-modules-commonjs": "^7.5.0",
- "@gitlab/eslint-config": "^1.6.0",
- "@gitlab/eslint-config": "^2.0.0",
- "@gitlab/eslint-plugin-i18n": "^1.1.0",
- "@gitlab/eslint-plugin-vue-i18n": "^1.2.0",
- "@vue/test-utils": "^1.0.0-beta.25",
@ -21,10 +21,9 @@
- "eslint": "~5.9.0",
- "eslint-import-resolver-jest": "^2.1.1",
- "eslint-import-resolver-webpack": "^0.10.1",
- "eslint-plugin-import": "^2.14.0",
- "eslint-plugin-jasmine": "^2.10.1",
- "eslint-plugin-jest": "^22.3.0",
- "eslint-plugin-no-jquery": "^2.1.0",
- "eslint-plugin-no-jquery": "^2.3.0",
- "gettext-extractor": "^3.4.3",
- "gettext-extractor-vue": "^4.0.2",
- "graphql-tag": "^2.10.0",
@ -61,8 +60,6 @@
- "vue-jest": "^4.0.0-beta.2",
- "webpack-dev-server": "^3.8.1",
- "yarn-deduplicate": "^1.1.1"
- },
+ },
},
"resolutions": {
"vue-jest/ts-jest": "24.0.0"
},

2
debian/patches/0520-add-system-lib-path-for-webpack.patch vendored
View file

@ -1,6 +1,6 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -127,9 +127,14 @@
@@ -151,9 +151,14 @@
resolve: {
extensions: ['.js', '.gql', '.graphql'],

8
debian/patches/0770-bump-node-d3.patch vendored
View file

@ -10,15 +10,15 @@ Subject: [PATCH 1/2] Update d3 node module 4.13 -> 5.12
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
@@ -66,7 +66,7 @@
"core-js": "^3.2.1",
"cropper": "^2.3.0",
"css-loader": "^1.0.0",
- "d3": "^4.13.0",
+ "d3": "^5.12.0",
"d3-array": "^1.2.1",
"d3-axis": "^1.0.8",
"d3-brush": "^1.0.4",
"d3-scale": "^1.0.7",
"d3-selection": "^1.2.0",
"dateformat": "^3.0.3",
--- a/app/assets/javascripts/vue_shared/components/bar_chart.vue
+++ b/app/assets/javascripts/vue_shared/components/bar_chart.vue
@@ -124,9 +124,7 @@