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

Refresh patches

Browse source
This commit is contained in:
Pirate Praveen 2021-04-30 00:10:56 +05:30
parent 98cd7bfd8e
commit 3cfb60517b
14 changed files with 86 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
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.1'
+gem 'rails', '~> 6.0.3', '>= 6.0.3.1'
-gem 'rails', '~> 6.0.3.6'
+gem 'rails', '~> 6.0.3','>= 6.0.3.6'
-gem 'bootsnap', '~> 1.4.6'
+gem 'bootsnap', '~> 1.4', '>= 1.4.6'
@ -87,8 +87,8 @@ gitlab Gemfile
+gem 'invisible_captcha', '~> 1.1'
# Two-factor authentication
-gem 'devise-two-factor', '~> 3.1.0'
+gem 'devise-two-factor', '~> 3.1'
-gem 'devise-two-factor', '~> 4.0.0'
+gem 'devise-two-factor', '~> 4.0'
gem 'rqrcode-rails3', '~> 0.1.7'
-gem 'attr_encrypted', '~> 3.1.0'
+gem 'attr_encrypted', '~> 3.1'
@ -142,8 +142,8 @@ gitlab Gemfile
gem 'kaminari', '~> 1.0'
# HAML
-gem 'hamlit', '~> 2.14.4'
+gem 'hamlit', '~> 2.14', '>= 2.14.4'
-gem 'hamlit', '~> 2.15.0'
+gem 'hamlit', '~> 2.15'
# Files attachments
gem 'carrierwave', '~> 1.3'
@ -188,12 +188,11 @@ gitlab Gemfile
+gem 'gitlab-markup', '~> 1.7', '>= 1.7.1'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.21'
-gem 'kramdown', '~> 2.3.0'
-gem 'kramdown', '~> 2.3.1'
-gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~> 6.1.2'
+gem 'kramdown', '~> 2.3'
+gem 'kramdown', '~> 2.3','>= 2.3.1'
+gem 'RedCloth', '~> 4.3', '>= 4.3.2'
+gem 'rdoc', '~> 6.1', '>= 6.1.2'
gem 'rdoc', '~> 6.1.2'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
@ -239,7 +238,7 @@ gitlab Gemfile
gem 'sidekiq-cron', '~> 1.0'
-gem 'redis-namespace', '~> 1.7.0'
+gem 'redis-namespace', '~> 1.7'
gem 'gitlab-sidekiq-fetcher', '0.5.5', require: 'sidekiq-reliable-fetch'
gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch'
# Cron Parser
-gem 'fugit', '~> 1.2.1'
@ -311,7 +310,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7'
@@ -290,9 +290,9 @@
@@ -287,9 +287,9 @@
gem 'rack-proxy', '~> 0.6.0'
@ -324,8 +323,8 @@ gitlab Gemfile
gem 'addressable', '~> 2.7'
gem 'gemojione', '~> 3.3'
@@ -303,15 +303,15 @@
gem "gitlab-license", "~> 1.3"
@@ -300,15 +300,15 @@
gem "gitlab-license", "~> 1.4"
# Protect against bruteforcing
-gem 'rack-attack', '~> 6.3.0'
@ -342,8 +341,8 @@ gitlab Gemfile
+gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.16.1'
@@ -322,11 +322,11 @@
gem 'gitlab-labkit', '~> 0.16.2'
@@ -319,11 +319,11 @@
# I18n
gem 'ruby_parser', '~> 3.15', require: false
gem 'rails-i18n', '~> 6.0'
@ -357,7 +356,7 @@ gitlab Gemfile
# Perf bar
gem 'peek', '~> 1.1'
@@ -358,38 +358,38 @@
@@ -354,38 +354,38 @@
end
group :development, :test do
@ -373,7 +372,7 @@ gitlab Gemfile
- gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 6.1.0'
- gem 'rspec-rails', '~> 4.0.2'
- gem 'rspec-rails', '~> 5.0.1'
+ gem 'database_cleaner', '~> 1.7'
+ gem 'factory_bot_rails', '~> 6.1'
+ gem 'rspec-rails', '~> 4.0', '>= 4.0.2'
@ -390,8 +389,8 @@ gitlab Gemfile
+ gem 'spring', '~> 2.1'
+ gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 6.1.0', require: false
+ gem 'gitlab-styles', '~> 6.1', require: false
- gem 'gitlab-styles', '~> 6.2.0', require: false
+ gem 'gitlab-styles', '~> 6.2', require: false
gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
@ -399,7 +398,8 @@ gitlab Gemfile
- gem 'benchmark-ips', '~> 2.3.0', require: false
+ gem 'benchmark-ips', '~> 2.3', require: false
gem 'knapsack', '~> 1.17'
- gem 'knapsack', '~> 1.21.1'
+ gem 'knapsack', '~> 1.21', '>= 1.21.1'
gem 'crystalball', '~> 0.7.0', require: false
- gem 'simple_po_parser', '~> 1.1.2', require: false
@ -407,11 +407,13 @@ gitlab Gemfile
gem 'timecop', '~> 0.9.1'
@@ -416,18 +416,18 @@
@@ -413,19 +413,19 @@
end
group :test do
- gem 'json-schema', '~> 2.8.0'
- gem 'fuubar', '~> 2.2.0'
+ gem 'json-schema', '~> 2.8'
+ gem 'fuubar', '~> 2.2'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.6'
@ -432,7 +434,7 @@ gitlab Gemfile
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0'
@@ -446,7 +446,7 @@
@@ -444,7 +444,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -441,7 +443,7 @@ gitlab Gemfile
gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
@@ -460,8 +460,8 @@
@@ -458,8 +458,8 @@
gem 'health_check', '~> 3.0'
# System information
@ -452,24 +454,25 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -477,13 +477,13 @@
@@ -475,13 +475,13 @@
end
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.9.0.pre.rc1'
+gem 'gitaly', '~> 13.9'
-gem 'gitaly', '~> 13.11.0.pre.rc1'
+gem 'gitaly', '~> 13.11'
-gem 'grpc', '~> 1.30.2'
+gem 'grpc', '~> 1.30', '>= 1.30.2'
gem 'google-protobuf', '~> 3.12'
-gem 'google-protobuf', '~> 3.14.0'
+gem 'google-protobuf', '~> 3.14'
-gem 'toml-rb', '~> 1.0.0'
+gem 'toml-rb', '~> 1.0'
# Feature toggles
gem 'flipper', '~> 0.17.1'
@@ -502,12 +502,12 @@
@@ -500,12 +500,12 @@
# Countries list
gem 'countries', '~> 3.0'
@ -484,14 +487,12 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -521,12 +521,12 @@
@@ -520,11 +520,11 @@
gem 'valid_email', '~> 0.1'
# JSON
-gem 'json', '~> 2.3.0'
-gem 'json-schema', '~> 2.8.0'
+gem 'json', '~> 2.3'
+gem 'json-schema', '~> 2.8'
gem 'json_schemer', '~> 0.2.12'
-gem 'oj', '~> 3.10.6'
-gem 'multi_json', '~> 1.14.1'

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

@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
gem 'hashie'
@@ -324,7 +323,6 @@
@@ -321,7 +320,6 @@
gem 'rails-i18n', '~> 6.0'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
@ -18,18 +18,17 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 2.0', '>= 2.0.1'
@@ -344,19 +342,6 @@
@@ -341,18 +339,6 @@
gem 'raindrops', '~> 0.18'
end
-group :development do
- gem 'brakeman', '~> 4.2', require: false
- gem 'lefthook', '~> 0.7', require: false
- gem 'lefthook', '~> 0.7.0', require: false
-
- gem 'letter_opener_web', '~> 1.3.4'
- gem 'letter_opener_web', '~> 1.4.0'
-
- # Better errors handler
- gem 'better_errors', '~> 2.7.1'
- gem 'better_errors', '~> 2.9.0'
-
- # thin instead webrick
- gem 'thin', '~> 1.8.0'
@ -38,22 +37,26 @@ 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 @@
@@ -375,11 +361,6 @@
gem 'spring', '~> 2.1'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 6.1', require: false
- gem 'gitlab-styles', '~> 6.2', require: false
-
- gem 'haml_lint', '~> 0.36.0', require: false
- gem 'bundler-audit', '~> 0.7.0.1', require: false
-
gem 'benchmark-ips', '~> 2.3', require: false
gem 'knapsack', '~> 1.17'
@@ -405,16 +385,6 @@
gem 'gitlab-dangerfiles', '~> 0.8.0', require: false
gem 'knapsack', '~> 1.21', '>= 1.21.1'
@@ -398,20 +379,6 @@
gem 'test_file_finder', '~> 0.1.3'
end
-group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 1.1.1', require: false
-end
-
-group :development, :test, :coverage do
- gem 'simplecov', '~> 0.18.5', require: false
- gem 'simplecov-cobertura', '~> 1.3.1', require: false
@ -65,5 +68,5 @@ Bundler will fail when it can't find these locally
-end
-
group :test do
gem 'json-schema', '~> 2.8'
gem 'fuubar', '~> 2.2'
gem 'rspec-retry', '~> 0.6.1'

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

@ -2,7 +2,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
--- a/Gemfile
+++ b/Gemfile
@@ -342,7 +342,7 @@
@@ -339,7 +339,7 @@
gem 'raindrops', '~> 0.18'
end
@ -11,18 +11,13 @@ 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 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
@@ -378,14 +378,6 @@
gem 'parallel', '~> 1.19', require: false
@@ -377,9 +377,7 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
gem 'test_file_finder', '~> 0.1.3'
-end
-
-group :development, :test, :danger do
- gem 'danger-gitlab', '~> 8.0', require: false
- gem 'gitlab-dangerfiles', '~> 0.8.0', require: false
-end
-
-group :test do
gem 'json-schema', '~> 2.8'
gem 'fuubar', '~> 2.2'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.6'

4
debian/patches/0350-relax-rdoc.patch vendored
View file

@ -4,9 +4,9 @@ Allow rdoc from ruby 2.5 to match requirement
+++ b/Gemfile
@@ -153,7 +153,7 @@
gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3'
gem 'kramdown', '~> 2.3','>= 2.3.1'
gem 'RedCloth', '~> 4.3', '>= 4.3.2'
-gem 'rdoc', '~> 6.1', '>= 6.1.2'
-gem 'rdoc', '~> 6.1.2'
+gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'

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

@ -11,4 +11,4 @@ maintaining two almost same packages.
-gem 'gitlab-markup', '~> 1.7', '>= 1.7.1'
gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3'
gem 'kramdown', '~> 2.3','>= 2.3.1'

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

@ -12,11 +12,11 @@ This gem is used only in gitlab Enterprise Edition
# Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0'
@@ -293,8 +290,6 @@
@@ -290,8 +287,6 @@
gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0'
-gem "gitlab-license", "~> 1.3"
-gem "gitlab-license", "~> 1.4"
-
# Protect against bruteforcing
gem 'rack-attack', '~> 6.3'

2
debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch vendored
View file

@ -6,7 +6,7 @@ Allow newer version in the archive to satisfy the requirement
gem 'sidekiq', '~> 5.2', '>= 5.2.7'
gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.7'
-gem 'gitlab-sidekiq-fetcher', '0.5.5', require: 'sidekiq-reliable-fetch'
-gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch'
+gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch'
# Cron Parser

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -372,7 +372,7 @@
@@ -373,7 +373,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
@@ -373,7 +373,6 @@
@@ -374,7 +374,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
@@ -382,7 +382,6 @@
@@ -383,7 +383,6 @@
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0'
gem 'rspec_junit_formatter'

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

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

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

@ -2,12 +2,12 @@ These are not required in production
--- a/package.json
+++ b/package.json
@@ -169,66 +169,6 @@
@@ -162,66 +162,6 @@
"xterm": "3.14.5"
},
"devDependencies": {
- "@babel/plugin-transform-modules-commonjs": "^7.10.1",
- "@gitlab/eslint-plugin": "8.1.0",
- "@gitlab/eslint-plugin": "8.2.0",
- "@gitlab/stylelint-config": "2.3.0",
- "@testing-library/dom": "^7.16.2",
- "@vue/test-utils": "1.1.2",
@ -20,11 +20,11 @@ These are not required in production
- "commander": "^2.18.0",
- "custom-jquery-matchers": "^2.1.0",
- "docdash": "^1.0.2",
- "eslint": "7.21.0",
- "eslint": "7.24.0",
- "eslint-import-resolver-jest": "3.0.0",
- "eslint-import-resolver-webpack": "0.13.0",
- "eslint-plugin-jasmine": "4.1.2",
- "eslint-plugin-no-jquery": "2.5.0",
- "eslint-plugin-no-jquery": "2.6.0",
- "gettext-extractor": "^3.5.3",
- "gettext-extractor-vue": "^5.0.0",
- "glob": "^7.1.6",

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

@ -2,7 +2,7 @@ Debian specific patch to allow webpack to resolve packaged node modules
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -188,9 +188,14 @@
@@ -189,9 +189,14 @@
resolve: {
extensions: ['.js', '.gql', '.graphql'],

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;
@@ -178,6 +177,8 @@
@@ -179,6 +178,8 @@
entry: generateEntries,
@ -37,7 +37,7 @@ Use debian packaged node modules when available
output: {
path: WEBPACK_OUTPUT_PATH,
publicPath: WEBPACK_PUBLIC_PATH,
@@ -187,13 +188,13 @@
@@ -188,13 +189,13 @@
},
resolve: {
@ -54,7 +54,7 @@ Use debian packaged node modules when available
},
module: {
@@ -206,9 +207,13 @@
@@ -207,9 +208,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'),
@@ -285,7 +290,7 @@
@@ -286,7 +291,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]',
@@ -572,19 +577,6 @@
@@ -581,19 +586,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),
@@ -621,6 +613,7 @@
@@ -630,6 +622,7 @@
node: {
fs: 'empty', // sqljs requires fs
@ -108,7 +108,7 @@ Use debian packaged node modules when available
};
--- a/package.json
+++ b/package.json
@@ -48,12 +48,12 @@
@@ -41,12 +41,12 @@
"webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
},
"dependencies": {
@ -126,8 +126,8 @@ 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.185.0",
@@ -76,7 +76,7 @@
"@gitlab/svgs": "1.189.0",
@@ -69,7 +69,7 @@
"aws-sdk": "^2.637.0",
"axios": "^0.20.0",
"babel-loader": "^8.2.2",
@ -136,7 +136,7 @@ Use debian packaged node modules when available
"bootstrap": "4.4.1",
"cache-loader": "^4.1.0",
"clipboard": "^1.7.1",
@@ -113,26 +113,28 @@
@@ -106,26 +106,26 @@
"jquery": "^3.5.0",
"jquery.caret": "^0.3.1",
"jquery.waitforimages": "^2.2.0",
@ -154,12 +154,11 @@ Use debian packaged node modules when available
+ "lodash": "link:/usr/share/nodejs/lodash",
"marked": "^0.3.12",
"mathjax": "3",
+ "mermaid": "link:/usr/share/nodejs/mermaid",
+ "minimatch": "link:/usr/share/nodejs/minimatch",
"mermaid": "^8.9.2",
"minimatch": "^3.0.4",
- "minimatch": "^3.0.4",
+ "minimatch": "link:/usr/share/nodejs/minimatch",
"monaco-editor": "^0.20.0",
"monaco-editor-webpack-plugin": "^1.9.0",
"monaco-editor-webpack-plugin": "^1.9.1",
"monaco-yaml": "^2.5.1",
"mousetrap": "1.6.5",
- "pdfjs-dist": "^2.0.943",
@ -175,7 +174,7 @@ Use debian packaged node modules when available
"raphael": "^2.2.7",
"raw-loader": "^4.0.2",
"select2": "3.5.2-browserify",
@@ -143,26 +145,25 @@
@@ -136,26 +136,25 @@
"style-loader": "^1.3.0",
"swagger-ui-dist": "^3.44.1",
"three": "^0.84.0",
@ -187,7 +186,7 @@ Use debian packaged node modules when available
"tiptap": "^1.32.1",
"tiptap-commands": "^1.17.1",
"tiptap-extensions": "^1.35.1",
"url-loader": "^3.0.0",
"url-loader": "^4.1.1",
- "uuid": "8.1.0",
+ "uuid": "link:/usr/share/nodejs/uuid",
"visibilityjs": "^1.2.4",
@ -198,12 +197,12 @@ Use debian packaged node modules when available
"vue-router": "3.4.9",
- "vue-template-compiler": "^2.6.12",
+ "vue-template-compiler": "link:/usr/share/nodejs/vue-template-compiler",
"vue-virtual-scroll-list": "^1.4.4",
"vue-virtual-scroll-list": "^1.4.7",
"vuedraggable": "^2.23.0",
"vuex": "^3.6.0",
"web-vitals": "^0.2.4",
"webpack": "^4.46.0",
- "webpack-bundle-analyzer": "^3.9.0",
- "webpack-bundle-analyzer": "^4.4.1",
"webpack-cli": "^3.3.12",
"webpack-stats-plugin": "^0.3.1",
"worker-loader": "^2.0.0",