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 2022-01-26 13:39:30 +05:30
parent ad12974701
commit 2564e827ed
7 changed files with 46 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
debian/patches/Gemfile/0010-relax-stable-libs.patch vendored
View file

@ -187,11 +187,11 @@ gitlab Gemfile
# Markdown and HTML processing # Markdown and HTML processing
-gem 'html-pipeline', '~> 2.13.2' -gem 'html-pipeline', '~> 2.13.2'
-gem 'deckar01-task_list', '2.3.1' -gem 'deckar01-task_list', '2.3.1'
-gem 'gitlab-markup', '~> 1.7.1' -gem 'gitlab-markup', '~> 1.8.0'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'html-pipeline', '~> 2.13','>= 2.13.2' +gem 'html-pipeline', '~> 2.13','>= 2.13.2'
+gem 'deckar01-task_list', '~> 2.3','>= 2.3.1' +gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'
+gem 'gitlab-markup', '~> 1.7','>= 1.7.1' +gem 'gitlab-markup', '~> 1.8'
+gem 'github-markup', '~> 1.7', require: 'github/markup' +gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.23.2' gem 'commonmarker', '~> 0.23.2'
-gem 'kramdown', '~> 2.3.1' -gem 'kramdown', '~> 2.3.1'
@ -229,17 +229,14 @@ gitlab Gemfile
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
group :puma do group :puma do
- gem 'puma', '~> 5.3.1', require: false - gem 'puma', '~> 5.5.2', require: false
+ gem 'puma', '~> 5.3','>= 5.3.1', require: false + gem 'puma', '~> 5.5', '>= 5.5.2', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false
gem 'sd_notify', '~> 0.1.0', require: false gem 'sd_notify', '~> 0.1.0', require: false
end end
@@ -197,13 +197,13 @@ @@ -199,11 +199,11 @@
gem 'acts-as-taggable-on', '~> 7.0'
# Background jobs # Background jobs
-gem 'sidekiq', '~> 6.2.2' gem 'sidekiq', '~> 6.3'
+gem 'sidekiq', '~> 6.2', '>= 6.2.2'
gem 'sidekiq-cron', '~> 1.0' gem 'sidekiq-cron', '~> 1.0'
-gem 'redis-namespace', '~> 1.8.1' -gem 'redis-namespace', '~> 1.8.1'
+gem 'redis-namespace', '~> 1.8','>= 1.8.1' +gem 'redis-namespace', '~> 1.8','>= 1.8.1'
@ -382,7 +379,7 @@ gitlab Gemfile
group :development do group :development do
gem 'lefthook', '~> 0.7.0', require: false gem 'lefthook', '~> 0.7.0', require: false
@@ -414,18 +414,18 @@ @@ -419,18 +419,18 @@
end end
group :test do group :test do
@ -409,7 +406,7 @@ gitlab Gemfile
gem 'rails-controller-testing' gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1' gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 1.0.7' gem 'test-prof', '~> 1.0.7'
@@ -444,7 +444,7 @@ @@ -449,7 +449,7 @@
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
@ -418,18 +415,18 @@ gitlab Gemfile
gem 'stackprof', '~> 0.2.15', require: false gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false gem 'memory_profiler', '~> 0.9', require: false
@@ -458,8 +458,8 @@ @@ -463,8 +463,8 @@
gem 'health_check', '~> 3.0' gem 'health_check', '~> 3.0'
# System information # System information
-gem 'vmstat', '~> 2.3.0' -gem 'vmstat', '~> 2.3.0'
-gem 'sys-filesystem', '~> 1.1.6' -gem 'sys-filesystem', '~> 1.4.3'
+gem 'vmstat', '~> 2.3' +gem 'vmstat', '~> 2.3'
+gem 'sys-filesystem', '~> 1.1', '>= 1.1.6' +gem 'sys-filesystem', '~> 1.4', '>= 1.4.3'
# NTP client # NTP client
gem 'net-ntp' gem 'net-ntp'
@@ -478,14 +478,14 @@ @@ -483,14 +483,14 @@
gem 'spamcheck', '~> 0.1.0' gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
@ -447,16 +444,16 @@ gitlab Gemfile
gem 'toml-rb', '~> 2.0' gem 'toml-rb', '~> 2.0'
@@ -493,7 +493,7 @@ @@ -498,7 +498,7 @@
gem 'flipper', '~> 0.21.0' gem 'flipper', '~> 0.21.0'
gem 'flipper-active_record', '~> 0.21.0' gem 'flipper-active_record', '~> 0.21.0'
gem 'flipper-active_support_cache_store', '~> 0.21.0' gem 'flipper-active_support_cache_store', '~> 0.21.0'
-gem 'unleash', '~> 3.2.2' -gem 'unleash', '~> 3.2.2'
+gem 'unleash', '~> 3.2', '>= 3.2.2' +gem 'unleash', '~> 3.2', '>= 3.2.2'
gem 'gitlab-experiment', '~> 0.6.4' gem 'gitlab-experiment', '~> 0.6.5'
# Structured logging # Structured logging
@@ -506,12 +506,12 @@ @@ -511,12 +511,12 @@
# Countries list # Countries list
gem 'countries', '~> 3.0' gem 'countries', '~> 3.0'
@ -471,7 +468,7 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved # Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb` # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -526,11 +526,11 @@ @@ -531,11 +531,11 @@
gem 'valid_email', '~> 0.1' gem 'valid_email', '~> 0.1'
# JSON # JSON

13
debian/patches/Gemfile/0020-remove-development-test.patch vendored
View file

@ -44,28 +44,33 @@ Bundler will fail when it can't find these locally
gem 'spring', '~> 2.1.0' gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'gitlab-styles', '~> 6.4.0', require: false - gem 'gitlab-styles', '~> 6.6.0', require: false
- -
- gem 'haml_lint', '~> 0.36.0', require: false - gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false
gem 'benchmark-ips', '~> 2.3.0', require: false gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -399,20 +379,6 @@ @@ -399,25 +379,6 @@
gem 'test_file_finder', '~> 0.1.3' gem 'test_file_finder', '~> 0.1.3'
end end
-group :development, :test, :danger do -group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 2.5.0', require: false - gem 'gitlab-dangerfiles', '~> 2.6.1', require: false
-end -end
- -
-group :development, :test, :coverage do -group :development, :test, :coverage do
- gem 'simplecov', '~> 0.18.5', require: false - gem 'simplecov', '~> 0.18.5', require: false
- gem 'simplecov-lcov', '~> 0.8.0', require: false
- gem 'simplecov-cobertura', '~> 1.3.1', require: false - gem 'simplecov-cobertura', '~> 1.3.1', require: false
- gem 'undercover', '~> 0.4.4', require: false
-end -end
- -
-# Gems required in omnibus-gitlab pipeline -# Gems required in omnibus-gitlab pipeline
-group :development, :test, :omnibus do -group :development, :test, :omnibus do
- gem 'license_finder', '~> 6.0', require: false - # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is
- # resolved. For details, check discussion in
- # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881
- gem 'gitlab-license_finder', '~> 6.0', require: false
-end -end
- -
group :test do group :test do

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

@ -8,7 +8,7 @@ maintaining two almost same packages.
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.13','>= 2.13.2' gem 'html-pipeline', '~> 2.13','>= 2.13.2'
gem 'deckar01-task_list', '~> 2.3','>= 2.3.1' gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'
-gem 'gitlab-markup', '~> 1.7','>= 1.7.1' -gem 'gitlab-markup', '~> 1.8'
gem 'github-markup', '~> 1.7', require: 'github/markup' gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.23.2' gem 'commonmarker', '~> 0.23.2'
gem 'kramdown', '~> 2.3','>= 2.3.1' gem 'kramdown', '~> 2.3','>= 2.3.1'

4
debian/patches/Gemfile/0170-relax-ipynbdiff.patch vendored
View file

@ -4,5 +4,5 @@
gem 'parslet', '~> 1.8' gem 'parslet', '~> 1.8'
-gem 'ipynbdiff', '0.3.7' -gem 'ipynbdiff', '0.3.8'
+gem 'ipynbdiff', '~> 0.3.7' +gem 'ipynbdiff', '~> 0.3.8'

9
debian/patches/nodejs/0020-remove-dev-dependencies.patch vendored
View file

@ -2,7 +2,7 @@ These are not required in production
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -204,61 +204,6 @@ @@ -206,61 +206,7 @@
"yaml": "^2.0.0-8" "yaml": "^2.0.0-8"
}, },
"devDependencies": { "devDependencies": {
@ -53,14 +53,15 @@ These are not required in production
- "prosemirror-test-builder": "^1.0.5", - "prosemirror-test-builder": "^1.0.5",
- "purgecss": "^4.0.3", - "purgecss": "^4.0.3",
- "purgecss-from-html": "^4.0.3", - "purgecss-from-html": "^4.0.3",
- "readdir-enhanced": "^2.2.4",
- "sass": "^1.32.12", - "sass": "^1.32.12",
- "timezone-mock": "^1.0.8", - "timezone-mock": "^1.0.8",
- "vue-jest": "4.0.1", - "vue-jest": "4.0.1",
- "webpack-dev-server": "^3.11.2", - "webpack-dev-server": "^3.11.3",
- "xhr-mock": "^2.5.1", - "xhr-mock": "^2.5.1",
- "yarn-check-webpack-plugin": "^1.2.0", - "yarn-check-webpack-plugin": "^1.2.0",
- "yarn-deduplicate": "^3.1.0" - "yarn-deduplicate": "^3.1.0"
}, - },
+ },
"blockedDependencies": { "blockedDependencies": {
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue" "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
},

24
debian/patches/nodejs/0040-use-packaged-modules.patch vendored
View file

@ -27,7 +27,7 @@ Use debian packaged node modules when available
const { StatsWriterPlugin } = require('webpack-stats-plugin'); const { StatsWriterPlugin } = require('webpack-stats-plugin');
const WEBPACK_VERSION = require('webpack/package.json').version; const WEBPACK_VERSION = require('webpack/package.json').version;
@@ -225,6 +224,8 @@ @@ -233,6 +232,8 @@
entry: generateEntries, entry: generateEntries,
@ -36,7 +36,7 @@ Use debian packaged node modules when available
output: { output: {
path: WEBPACK_OUTPUT_PATH, path: WEBPACK_OUTPUT_PATH,
publicPath: WEBPACK_PUBLIC_PATH, publicPath: WEBPACK_PUBLIC_PATH,
@@ -234,10 +235,15 @@ @@ -242,10 +243,15 @@
}, },
resolve: { resolve: {
@ -53,7 +53,7 @@ Use debian packaged node modules when available
module: { module: {
strictExportPresence: true, strictExportPresence: true,
rules: [ rules: [
@@ -248,9 +254,13 @@ @@ -256,9 +262,13 @@
}, },
{ {
test: /\.js$/, test: /\.js$/,
@ -68,7 +68,7 @@ Use debian packaged node modules when available
loader: 'babel-loader', loader: 'babel-loader',
options: { options: {
cacheDirectory: path.join(CACHE_PATH, 'babel-loader'), cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
@@ -337,7 +347,7 @@ @@ -345,7 +355,7 @@
}, },
{ {
test: /\.(eot|ttf|woff|woff2)$/, test: /\.(eot|ttf|woff|woff2)$/,
@ -77,7 +77,7 @@ Use debian packaged node modules when available
loader: 'file-loader', loader: 'file-loader',
options: { options: {
name: '[name].[contenthash:8].[ext]', name: '[name].[contenthash:8].[ext]',
@@ -647,19 +657,6 @@ @@ -655,19 +665,6 @@
// enable HMR only in webpack-dev-server // enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(), DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@ -97,7 +97,7 @@ Use debian packaged node modules when available
new webpack.DefinePlugin({ new webpack.DefinePlugin({
// These are used to define window.gon.ee, window.gon.jh and other things properly in tests: // These are used to define window.gon.ee, window.gon.jh and other things properly in tests:
'process.env.IS_EE': JSON.stringify(IS_EE), 'process.env.IS_EE': JSON.stringify(IS_EE),
@@ -698,6 +695,7 @@ @@ -706,6 +703,7 @@
node: { node: {
fs: 'empty', // sqljs requires fs fs: 'empty', // sqljs requires fs
@ -125,9 +125,9 @@ Use debian packaged node modules when available
+ "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env", + "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
"@gitlab/at.js": "1.5.7", "@gitlab/at.js": "1.5.7",
"@gitlab/favicon-overlay": "2.0.0", "@gitlab/favicon-overlay": "2.0.0",
"@gitlab/svgs": "1.220.0", "@gitlab/svgs": "2.0.0",
"@gitlab/tributejs": "1.0.0", "@gitlab/tributejs": "1.0.0",
"@gitlab/ui": "32.36.0", "@gitlab/ui": "32.50.0",
"@gitlab/visual-review-tools": "1.6.1", "@gitlab/visual-review-tools": "1.6.1",
- "@rails/actioncable": "6.1.4-1", - "@rails/actioncable": "6.1.4-1",
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable", + "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
@ -143,7 +143,7 @@ Use debian packaged node modules when available
"bootstrap": "4.5.3", "bootstrap": "4.5.3",
"cache-loader": "^4.1.0", "cache-loader": "^4.1.0",
"canvas-confetti": "^1.4.0", "canvas-confetti": "^1.4.0",
@@ -139,30 +139,30 @@ @@ -141,30 +141,30 @@
"jed": "^1.1.1", "jed": "^1.1.1",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"jquery.caret": "^0.3.1", "jquery.caret": "^0.3.1",
@ -178,15 +178,15 @@ Use debian packaged node modules when available
"portal-vue": "^2.1.7", "portal-vue": "^2.1.7",
"prismjs": "^1.21.0", "prismjs": "^1.21.0",
- "prosemirror-markdown": "^1.6.0", - "prosemirror-markdown": "^1.6.0",
- "prosemirror-model": "^1.14.3", - "prosemirror-model": "^1.15.0",
- "prosemirror-state": "^1.3.4", - "prosemirror-state": "^1.3.4",
+ "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown", + "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
+ "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model", + "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
+ "prosemirror-state": "link:/usr/share/nodejs/prosemirror-state", + "prosemirror-state": "link:/usr/share/nodejs/prosemirror-state",
"prosemirror-tables": "^1.1.1", "prosemirror-tables": "^1.1.1",
"prosemirror-view": "^1.20.3", "prosemirror-view": "^1.23.3",
"raphael": "^2.2.7", "raphael": "^2.2.7",
@@ -176,27 +176,26 @@ @@ -178,27 +178,26 @@
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
"swagger-ui-dist": "^3.52.3", "swagger-ui-dist": "^3.52.3",
"three": "^0.84.0", "three": "^0.84.0",

2
debian/patches/tweaks/0080-search-binaries-in-path.patch vendored
View file

@ -11,7 +11,7 @@ Last-Update: 2021-01-26
"github.com/golang-jwt/jwt/v4" "github.com/golang-jwt/jwt/v4"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@@ -80,8 +81,11 @@ @@ -97,8 +98,11 @@
rootDir := RootDir() rootDir := RootDir()
for _, exe := range workhorseExecutables { for _, exe := range workhorseExecutables {