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 2021-09-04 02:51:02 +05:30
parent ed44479d24
commit 03ff48a997
15 changed files with 116 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,8 +7,8 @@ gitlab Gemfile
source 'https://rubygems.org'
-gem 'rails', '~> 6.0.3.7'
+gem 'rails', '~> 6.0.3','>= 6.0.3.7'
-gem 'rails', '~> 6.1.3.2'
+gem 'rails', '~> 6.1.3','>= 6.1.3.2'
-gem 'bootsnap', '~> 1.4.6'
+gem 'bootsnap', '~> 1.4','>= 1.4.6'
@ -133,16 +133,15 @@ gitlab Gemfile
# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
# https://gitlab.com/gitlab-org/gitlab/issues/31747
-gem 'graphiql-rails', '~> 1.4.10'
-gem 'apollo_upload_server', '~> 2.0.2'
gem 'graphiql-rails', '~> 1.4.10'
-gem 'apollo_upload_server', '~> 2.1.0'
-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
+gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
+gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'
+gem 'apollo_upload_server', '~> 2.0'
+gem 'graphql-docs', '~> 1.6', group: [:development, :test]
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
gem 'hashie'
@@ -113,11 +113,11 @@
@@ -113,23 +113,23 @@
gem 'kaminari', '~> 1.0'
# HAML
@ -156,12 +155,17 @@ gitlab Gemfile
# for backups
gem 'fog-aws', '~> 3.9'
@@ -129,7 +129,7 @@
# 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'
+gem 'fog-core', '= 2.1'
gem 'gitlab-fog-google', '~> 1.13', require: 'fog/google'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3'
-gem 'gitlab-fog-azure-rm', '~> 1.0.1', require: false
+gem 'gitlab-fog-azure-rm', '~> 1.0', '>= 1.0.1', require: false
-gem 'gitlab-fog-azure-rm', '~> 1.1.1', require: false
+gem 'gitlab-fog-azure-rm', '~> 1.1','>= 1.1.1', require: false
# for Google storage
gem 'google-api-client', '~> 0.33'
@ -216,7 +220,7 @@ gitlab Gemfile
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -179,7 +179,7 @@
@@ -179,12 +179,12 @@
gem 'diff_match_patch', '~> 0.1.0'
# Application server
@ -225,16 +229,13 @@ gitlab Gemfile
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
@@ -189,7 +189,7 @@
end
group :puma do
- gem 'puma', '~> 5.1.1', require: false
+ gem 'puma', '~> 5.1', '>= 5.1.1', require: false
- gem 'puma', '~> 5.3.1', require: false
+ gem 'puma', '~> 5.3','>= 5.3.1', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false
end
@@ -200,13 +200,13 @@
@@ -195,13 +195,13 @@
gem 'acts-as-taggable-on', '~> 7.0'
# Background jobs
@ -251,7 +252,7 @@ gitlab Gemfile
# HTTP requests
gem 'httparty', '~> 0.16.4'
@@ -218,14 +218,14 @@
@@ -213,14 +213,14 @@
gem 'ruby-progressbar', '~> 1.10'
# GitLab settings
@ -269,7 +270,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.4'
@@ -238,20 +238,20 @@
@@ -233,20 +233,20 @@
gem 'connection_pool', '~> 2.0'
# Redis session store
@ -292,8 +293,8 @@ gitlab Gemfile
+gem 'slack-messenger', '~> 2.3', '>= 2.3.4'
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -263,17 +263,17 @@
gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
@@ -258,17 +258,17 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -315,7 +316,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7'
@@ -290,28 +290,28 @@
@@ -285,20 +285,20 @@
gem 'rack-proxy', '~> 0.6.0'
@ -323,7 +324,7 @@ gitlab Gemfile
-gem 'autoprefixer-rails', '10.2.0.0'
-gem 'terser', '1.0.2'
+gem 'sassc-rails', '~> 2.1'
+gem 'autoprefixer-rails', '~> 10.2'
+gem 'autoprefixer-rails', '10.2'
+gem 'terser', '~> 1.0','>= 1.0.2'
gem 'addressable', '~> 2.7'
@ -340,17 +341,19 @@ gitlab Gemfile
+gem 'rack-attack', '~> 6.3'
# Sentry integration
gem 'sentry-raven', '~> 3.0'
# PostgreSQL query parsing
-gem 'pg_query', '~> 1.3.0'
+gem 'pg_query', '~> 1.3'
gem 'sentry-raven', '~> 3.1'
@@ -309,9 +309,9 @@
# and https://github.com/pganalyze/pg_query/pull/213 are
# released. gitlab-labkit will need to be updated to use the pg_query
# version.
-gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query'
+gem 'gitlab-pg_query', '~> 2.0','>= 2.0.4', require: 'pg_query'
-gem 'premailer-rails', '~> 1.10.3'
+gem 'premailer-rails', '~> 1.10','>= 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.16.2'
gem 'gitlab-labkit', '~> 0.18.0'
@@ -322,11 +322,11 @@
# I18n
gem 'ruby_parser', '~> 3.15', require: false
@ -365,7 +368,7 @@ gitlab Gemfile
# Perf bar
gem 'peek', '~> 1.1'
@@ -358,38 +358,38 @@
@@ -357,38 +357,38 @@
end
group :development, :test do
@ -416,7 +419,7 @@ gitlab Gemfile
gem 'timecop', '~> 0.9.1'
@@ -417,18 +417,18 @@
@@ -416,18 +416,18 @@
end
group :test do
@ -441,7 +444,7 @@ gitlab Gemfile
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0'
@@ -447,7 +447,7 @@
@@ -446,7 +446,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -450,7 +453,7 @@ gitlab Gemfile
gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
@@ -461,8 +461,8 @@
@@ -460,8 +460,8 @@
gem 'health_check', '~> 3.0'
# System information
@ -461,25 +464,28 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -481,13 +481,13 @@
@@ -480,16 +480,16 @@
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.12.0.pre.rc1'
+gem 'gitaly', '~> 13.12'
-gem 'gitaly', '~> 14.0.0.pre.rc2'
+gem 'gitaly', '~> 14.0'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
-gem 'grpc', '~> 1.30.2'
+gem 'grpc', '~> 1.30','>= 1.30.2'
-gem 'google-protobuf', '~> 3.14.0'
+gem 'google-protobuf', '~> 3.14'
-gem 'google-protobuf', '~> 3.17.1'
+gem 'google-protobuf', '~> 3.17','>= 3.17.1'
-gem 'toml-rb', '~> 1.0.0'
+gem 'toml-rb', '~> 1.0'
# Feature toggles
gem 'flipper', '~> 0.17.1'
@@ -506,12 +506,12 @@
gem 'flipper', '~> 0.21.0'
@@ -508,12 +508,12 @@
# Countries list
gem 'countries', '~> 3.0'
@ -494,7 +500,7 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -526,11 +526,11 @@
@@ -528,11 +528,11 @@
gem 'valid_email', '~> 0.1'
# JSON

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

@ -4,8 +4,8 @@ Bundler will fail when it can't find these locally
+++ b/Gemfile
@@ -102,7 +102,6 @@
# https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'
gem 'graphiql-rails', '~> 1.4.10'
gem 'apollo_upload_server', '~> 2.0'
-gem 'graphql-docs', '~> 1.6', group: [:development, :test]
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
@ -18,13 +18,13 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 2.0', '>= 2.0.1'
@@ -344,19 +342,6 @@
gem 'raindrops', '~> 0.18'
@@ -343,19 +341,6 @@
gem 'prometheus-client-mmap', '~> 0.12.0'
end
-group :development do
- gem 'lefthook', '~> 0.7.0', require: false
- gem 'solargraph', '~> 0.40.4', require: false
- gem 'solargraph', '~> 0.42', require: false
-
- gem 'letter_opener_web', '~> 1.4.0'
-
@ -38,7 +38,7 @@ Bundler will fail when it can't find these locally
group :development, :test do
gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
gem 'bullet', '~> 6.1', '>= 6.1.3'
@@ -379,11 +364,6 @@
@@ -378,11 +363,6 @@
gem 'spring', '~> 2.1'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
@ -50,12 +50,12 @@ Bundler will fail when it can't find these locally
gem 'benchmark-ips', '~> 2.3', require: false
gem 'knapsack', '~> 1.21', '>= 1.21.1'
@@ -402,20 +382,6 @@
@@ -401,20 +381,6 @@
gem 'test_file_finder', '~> 0.1.3'
end
-group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 2.0.0', require: false
- gem 'gitlab-dangerfiles', '~> 2.1.2', require: false
-end
-
-group :development, :test, :coverage do

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

@ -2,8 +2,8 @@ Make test dependencies conditional so we can enable them when running autopkgtes
--- a/Gemfile
+++ b/Gemfile
@@ -342,7 +342,7 @@
gem 'raindrops', '~> 0.18'
@@ -341,7 +341,7 @@
gem 'prometheus-client-mmap', '~> 0.12.0'
end
-group :development, :test do
@ -11,7 +11,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
gem 'bullet', '~> 6.1', '>= 6.1.3'
gem 'pry-byebug'
@@ -380,9 +380,7 @@
@@ -379,9 +379,7 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
gem 'test_file_finder', '~> 0.1.3'

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

@ -2,7 +2,7 @@ Allow newer versions of httparty to satisfy dependency
--- a/Gemfile
+++ b/Gemfile
@@ -208,7 +208,7 @@
@@ -203,7 +203,7 @@
gem 'fugit', '~> 1.2', '>= 1.2.1'
# HTTP requests

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -375,7 +375,7 @@
@@ -379,7 +379,7 @@
gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -376,7 +376,6 @@
@@ -380,7 +380,6 @@
gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.12'

2
debian/patches/0499-30-remove-guard-rspec.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -385,7 +385,6 @@
@@ -389,7 +389,6 @@
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0'
gem 'rspec_junit_formatter'

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

@ -4,8 +4,8 @@ newer version is in the archive
+++ b/Gemfile
@@ -99,7 +99,7 @@
# https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'
gem 'graphiql-rails', '~> 1.4.10'
gem 'apollo_upload_server', '~> 2.0'
-gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
+gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)

2
debian/patches/0499-90-relax-webrick.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -324,7 +324,7 @@
@@ -329,7 +329,7 @@
# Metrics
group :metrics do
gem 'method_source', '~> 1.0', require: false

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

@ -2,7 +2,7 @@ These are not required in production
--- a/package.json
+++ b/package.json
@@ -189,67 +189,7 @@
@@ -191,69 +191,6 @@
"xterm": "3.14.5"
},
"devDependencies": {
@ -10,17 +10,18 @@ These are not required in production
- "@gitlab/eslint-plugin": "8.4.0",
- "@gitlab/stylelint-config": "2.3.0",
- "@testing-library/dom": "^7.16.2",
- "@vue/test-utils": "1.1.2",
- "@vue/test-utils": "1.2.0",
- "acorn": "^6.3.0",
- "axios-mock-adapter": "^1.15.0",
- "babel-jest": "^26.5.2",
- "babel-plugin-dynamic-import-node": "^2.3.3",
- "babel-plugin-istanbul": "^6.0.0",
- "chalk": "^2.4.1",
- "cheerio": "^1.0.0-rc.9",
- "commander": "^2.18.0",
- "custom-jquery-matchers": "^2.1.0",
- "docdash": "^1.0.2",
- "eslint": "7.26.0",
- "eslint": "7.28.0",
- "eslint-import-resolver-jest": "3.0.0",
- "eslint-import-resolver-webpack": "0.13.1",
- "eslint-plugin-jasmine": "4.1.2",
@ -58,6 +59,8 @@ These are not required in production
- "nodemon": "^2.0.4",
- "postcss": "^7.0.14",
- "prettier": "2.2.1",
- "purgecss": "^4.0.3",
- "purgecss-from-html": "^4.0.3",
- "readdir-enhanced": "^2.2.4",
- "sass": "^1.32.12",
- "timezone-mock": "^1.0.8",
@ -66,8 +69,6 @@ These are not required in production
- "xhr-mock": "^2.5.1",
- "yarn-check-webpack-plugin": "^1.2.0",
- "yarn-deduplicate": "^1.1.1"
- },
+ },
},
"blockedDependencies": {
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
},

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

@ -13,8 +13,8 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/12954
###
# DO NOT EDIT THIS FILE!
@@ -48,7 +51,7 @@
web_server_pid_path="$pid_path/$use_web_server.pid"
@@ -37,7 +40,7 @@
web_server_pid_path="$pid_path/puma.pid"
mail_room_enabled=false
mail_room_pid_path="$pid_path/mail_room.pid"
-gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse 2> /dev/null && pwd)

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

@ -28,7 +28,7 @@ Use debian packaged node modules when available
const { StatsWriterPlugin } = require('webpack-stats-plugin');
const WEBPACK_VERSION = require('webpack/package.json').version;
@@ -179,6 +178,8 @@
@@ -188,6 +187,8 @@
entry: generateEntries,
@ -37,7 +37,7 @@ Use debian packaged node modules when available
output: {
path: WEBPACK_OUTPUT_PATH,
publicPath: WEBPACK_PUBLIC_PATH,
@@ -188,10 +189,15 @@
@@ -197,10 +198,15 @@
},
resolve: {
@ -54,7 +54,7 @@ Use debian packaged node modules when available
module: {
strictExportPresence: true,
rules: [
@@ -202,9 +208,13 @@
@@ -211,9 +217,13 @@
},
{
test: /\.js$/,
@ -69,7 +69,7 @@ Use debian packaged node modules when available
loader: 'babel-loader',
options: {
cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
@@ -281,7 +291,7 @@
@@ -290,7 +300,7 @@
},
{
test: /\.(eot|ttf|woff|woff2)$/,
@ -78,7 +78,7 @@ Use debian packaged node modules when available
loader: 'file-loader',
options: {
name: '[name].[contenthash:8].[ext]',
@@ -570,19 +580,6 @@
@@ -579,19 +589,6 @@
// enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@ -98,7 +98,7 @@ Use debian packaged node modules when available
new webpack.DefinePlugin({
// This one is used to define window.gon.ee and other things properly in tests:
'process.env.IS_EE': JSON.stringify(IS_EE),
@@ -619,6 +616,7 @@
@@ -628,6 +625,7 @@
node: {
fs: 'empty', // sqljs requires fs
@ -108,7 +108,7 @@ Use debian packaged node modules when available
};
--- a/package.json
+++ b/package.json
@@ -43,19 +43,19 @@
@@ -46,19 +46,19 @@
"webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
},
"dependencies": {
@ -126,16 +126,16 @@ Use debian packaged node modules when available
+ "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
"@gitlab/at.js": "1.5.7",
"@gitlab/favicon-overlay": "2.0.0",
"@gitlab/svgs": "1.197.0",
"@gitlab/svgs": "1.199.0",
"@gitlab/tributejs": "1.0.0",
"@gitlab/ui": "29.27.0",
"@gitlab/ui": "29.35.0",
"@gitlab/visual-review-tools": "1.6.1",
- "@rails/actioncable": "^6.0.3-4",
- "@rails/actioncable": "6.1.3-2",
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
"@rails/ujs": "^6.0.3-4",
"@sentry/browser": "^5.22.3",
"@rails/ujs": "6.1.3-2",
"@sentry/browser": "5.26.0",
"@sourcegraph/code-host-integration": "0.0.57",
@@ -93,7 +93,7 @@
@@ -96,7 +96,7 @@
"aws-sdk": "^2.637.0",
"axios": "^0.20.0",
"babel-loader": "^8.2.2",
@ -144,8 +144,8 @@ Use debian packaged node modules when available
"bootstrap": "4.5.3",
"cache-loader": "^4.1.0",
"clipboard": "^1.7.1",
@@ -129,28 +129,28 @@
"jquery": "^3.5.0",
@@ -130,29 +130,29 @@
"jquery": "^3.6.0",
"jquery.caret": "^0.3.1",
"jquery.waitforimages": "^2.2.0",
- "js-cookie": "^2.2.1",
@ -160,9 +160,10 @@ Use debian packaged node modules when available
+ "jszip-utils": "link:/usr/share/nodejs/jszip",
+ "katex": "link:/usr/share/nodejs/katex",
+ "lodash": "link:/usr/share/nodejs/lodash",
"lowlight": "^1.20.0",
"marked": "^0.3.12",
"mathjax": "3",
"mermaid": "^8.9.2",
"mermaid": "^8.10.2",
- "minimatch": "^3.0.4",
+ "minimatch": "link:/usr/share/nodejs/minimatch",
"monaco-editor": "^0.20.0",
@ -184,7 +185,7 @@ Use debian packaged node modules when available
"raphael": "^2.2.7",
"raw-loader": "^4.0.2",
"scrollparent": "^2.0.1",
@@ -162,27 +162,26 @@
@@ -164,27 +164,26 @@
"style-loader": "^2.0.0",
"swagger-ui-dist": "^3.44.1",
"three": "^0.84.0",

2
debian/patches/0770-remove-capybara-screenshot-rspec.patch vendored
View file

@ -8,7 +8,7 @@
require 'selenium-webdriver'
# Give CI some extra time
@@ -108,18 +107,6 @@
@@ -109,18 +108,6 @@
Capybara.default_normalize_ws = true
Capybara.enable_aria_label = true