Refresh patches

This commit is contained in:
Pirate Praveen 2022-05-07 22:13:53 +05:30
parent 478b71c67b
commit 46b2f93f0e
No known key found for this signature in database
GPG key ID: 8F53E0193B294B75
21 changed files with 88 additions and 76 deletions

View file

@ -3,7 +3,7 @@ gitlab Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -2,59 +2,59 @@
@@ -2,61 +2,61 @@
source 'https://rubygems.org'
@ -19,6 +19,9 @@ gitlab Gemfile
-gem 'sprockets', '~> 3.7.0'
+gem 'sprockets', '~> 3.7'
-gem 'view_component', '~> 2.50.0'
+gem 'view_component', '~> 2.50'
# Default values for AR models
-gem 'default_value_for', '~> 3.4.0'
+gem 'default_value_for', '~> 3.4'
@ -84,7 +87,7 @@ gitlab Gemfile
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
@@ -62,17 +62,17 @@
@@ -64,17 +64,17 @@
# Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0'
@ -107,7 +110,7 @@ gitlab Gemfile
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.9'
@@ -83,7 +83,7 @@
@@ -85,7 +85,7 @@
gem 'ohai', '~> 16.10'
# GPG
@ -116,7 +119,7 @@ gitlab Gemfile
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
@@ -92,14 +92,14 @@
@@ -94,14 +94,14 @@
gem 'net-ldap', '~> 0.16.3'
# API
@ -135,7 +138,7 @@ gitlab Gemfile
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
@@ -111,23 +111,23 @@
@@ -113,23 +113,23 @@
gem 'kaminari', '~> 1.0'
# HAML
@ -163,7 +166,7 @@ gitlab Gemfile
# for Google storage
gem 'google-api-client', '~> 0.33'
@@ -136,37 +136,37 @@
@@ -138,37 +138,37 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -215,7 +218,7 @@ gitlab Gemfile
gem 'nokogiri', '~> 1.12'
gem 'escape_utils', '~> 1.1'
@@ -178,12 +178,12 @@
@@ -180,12 +180,12 @@
gem 'diff_match_patch', '~> 0.1.0'
# Application server
@ -230,7 +233,7 @@ gitlab Gemfile
gem 'puma_worker_killer', '~> 0.3.1', require: false
gem 'sd_notify', '~> 0.1.0', require: false
end
@@ -197,11 +197,11 @@
@@ -199,11 +199,11 @@
# Background jobs
gem 'sidekiq', '~> 6.4'
gem 'sidekiq-cron', '~> 1.2'
@ -244,7 +247,7 @@ gitlab Gemfile
# HTTP requests
gem 'httparty', '~> 0.16.4'
@@ -213,14 +213,14 @@
@@ -215,14 +215,14 @@
gem 'ruby-progressbar', '~> 1.10'
# GitLab settings
@ -262,7 +265,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.7'
@@ -229,24 +229,24 @@
@@ -231,24 +231,24 @@
gem 'device_detector'
# Redis
@ -291,7 +294,7 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
@@ -258,17 +258,17 @@
@@ -260,17 +260,17 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -312,7 +315,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7'
@@ -285,20 +285,20 @@
@@ -287,32 +287,32 @@
gem 'rack-proxy', '~> 0.6.0'
@ -324,7 +327,7 @@ gitlab Gemfile
+gem 'terser', '~> 1.0','>= 1.0.2'
gem 'addressable', '~> 2.8'
gem 'tanuki_emoji', '~> 0.5'
gem 'tanuki_emoji', '~> 0.6'
-gem 'gon', '~> 6.4.0'
+gem 'gon', '~> 6.4'
gem 'request_store', '~> 1.5'
@ -339,7 +342,14 @@ gitlab Gemfile
# Sentry integration
gem 'sentry-raven', '~> 3.1'
@@ -307,7 +307,7 @@
-gem 'sentry-ruby', '~> 5.1.1'
-gem 'sentry-rails', '~> 5.1.1'
-gem 'sentry-sidekiq', '~> 5.1.1'
+gem 'sentry-ruby', '~> 5.1', '>= 5.1.1'
+gem 'sentry-rails', '~> 5.1', '>= 5.1.1'
+gem 'sentry-sidekiq', '~> 5.1', '>= 5.1.1'
# PostgreSQL query parsing
#
gem 'pg_query', '~> 2.1'
@ -348,7 +358,7 @@ gitlab Gemfile
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.22.0'
@@ -318,11 +318,11 @@
@@ -323,11 +323,11 @@
# I18n
gem 'ruby_parser', '~> 3.15', require: false
gem 'rails-i18n', '~> 6.0'
@ -362,7 +372,7 @@ gitlab Gemfile
# Perf bar
gem 'peek', '~> 1.1'
@@ -332,10 +332,10 @@
@@ -337,10 +337,10 @@
# Metrics
gem 'method_source', '~> 1.0', require: false
@ -375,7 +385,7 @@ gitlab Gemfile
group :development do
gem 'lefthook', '~> 0.7.0', require: false
@@ -415,18 +415,18 @@
@@ -422,22 +422,22 @@
end
group :test do
@ -383,6 +393,7 @@ gitlab Gemfile
+ gem 'fuubar', '~> 2.2'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-benchmark', '~> 0.6.0'
gem 'rspec-parameterized', require: false
- gem 'capybara', '~> 3.35.3'
@ -401,8 +412,12 @@ gitlab Gemfile
+ gem 'webmock', '~> 3.9', '>= 3.9.1'
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 1.0.7'
@@ -446,7 +446,7 @@
- gem 'test-prof', '~> 1.0.7'
+ gem 'test-prof', '~> 1.0', '>= 1.0.7'
gem 'rspec_junit_formatter'
gem 'guard-rspec'
@@ -454,7 +454,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -411,7 +426,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 @@
@@ -468,8 +468,8 @@
gem 'health_check', '~> 3.0'
# System information
@ -422,12 +437,12 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -473,14 +473,14 @@
@@ -481,14 +481,14 @@
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 14.8.0.pre.rc1'
+gem 'gitaly', '~> 14.8'
-gem 'gitaly', '~> 14.9.0.pre.rc4'
+gem 'gitaly', '~> 14.9'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
@ -440,7 +455,7 @@ gitlab Gemfile
gem 'toml-rb', '~> 2.0'
@@ -488,7 +488,7 @@
@@ -496,7 +496,7 @@
gem 'flipper', '~> 0.21.0'
gem 'flipper-active_record', '~> 0.21.0'
gem 'flipper-active_support_cache_store', '~> 0.21.0'
@ -449,7 +464,7 @@ gitlab Gemfile
gem 'gitlab-experiment', '~> 0.7.0'
# Structured logging
@@ -501,12 +501,12 @@
@@ -509,12 +509,12 @@
# Countries list
gem 'countries', '~> 3.0'
@ -464,7 +479,7 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -521,11 +521,11 @@
@@ -529,11 +529,11 @@
gem 'valid_email', '~> 0.1'
# JSON
@ -480,3 +495,9 @@ gitlab Gemfile
gem 'webauthn', '~> 2.3'
@@ -542,4 +542,4 @@
gem 'parslet', '~> 1.8'
-gem 'ipynbdiff', '0.4.5'
+gem 'ipynbdiff', '~> 0.4.5'

View file

@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,6 @@
@@ -102,7 +102,6 @@
gem 'graphql', '~> 1.11', '>= 1.11.10'
gem 'graphiql-rails', '~> 1.8'
gem 'apollo_upload_server', '~> 2.1'
@ -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'
@@ -320,7 +319,6 @@
@@ -325,7 +324,6 @@
gem 'rails-i18n', '~> 6.0'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
@ -18,7 +18,7 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 2.0', '>= 2.0.1'
@@ -337,83 +335,6 @@
@@ -342,85 +340,6 @@
gem 'warning', '~> 1.2'
@ -59,7 +59,7 @@ Bundler will fail when it can't find these locally
- gem 'spring', '~> 2.1.0'
- gem 'spring-commands-rspec', '~> 1.0.4'
-
- gem 'gitlab-styles', '~> 6.6.0', require: false
- gem 'gitlab-styles', '~> 7.0.0', require: false
-
- gem 'haml_lint', '~> 0.36.0', require: false
- gem 'bundler-audit', '~> 0.7.0.1', require: false
@ -78,14 +78,16 @@ Bundler will fail when it can't find these locally
- gem 'parallel', '~> 1.19', require: false
-
- gem 'test_file_finder', '~> 0.1.3'
-
- gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup'
-end
-
-group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 2.8.0', require: false
- gem 'gitlab-dangerfiles', '~> 2.11.0', require: false
-end
-
-group :development, :test, :coverage do
- gem 'simplecov', '~> 0.18.5', require: false
- gem 'simplecov', '~> 0.21', require: false
- gem 'simplecov-lcov', '~> 0.8.0', require: false
- gem 'simplecov-cobertura', '~> 1.3.1', require: false
- gem 'undercover', '~> 0.4.4', require: false

View file

@ -2,7 +2,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
--- a/Gemfile
+++ b/Gemfile
@@ -335,7 +335,7 @@
@@ -340,7 +340,7 @@
gem 'warning', '~> 1.2'

View file

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

View file

@ -2,7 +2,7 @@ Allow rdoc from ruby 2.5 to match requirement
--- a/Gemfile
+++ b/Gemfile
@@ -155,7 +155,7 @@
@@ -157,7 +157,7 @@
gem 'commonmarker', '~> 0.23.4'
gem 'kramdown', '~> 2.3','>= 2.3.1'
gem 'RedCloth', '~> 4.3','>= 4.3.2'

View file

@ -4,7 +4,7 @@ maintaining two almost same packages.
--- a/Gemfile
+++ b/Gemfile
@@ -150,7 +150,6 @@
@@ -152,7 +152,6 @@
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.13','>= 2.13.2'
gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'

View file

@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
--- a/Gemfile
+++ b/Gemfile
@@ -138,7 +138,7 @@
@@ -140,7 +140,7 @@
gem 'seed-fu', '~> 2.3','>= 2.3.7'
# Search

View file

@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
--- a/Gemfile
+++ b/Gemfile
@@ -139,7 +139,7 @@
@@ -141,7 +141,7 @@
# Search
gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'

View file

@ -2,7 +2,7 @@ This gem is used only in gitlab Enterprise Edition
--- a/Gemfile
+++ b/Gemfile
@@ -56,9 +56,6 @@
@@ -58,9 +58,6 @@
gem 'rack-oauth2', '~> 1.16'
gem 'jwt', '~> 2.1'
@ -12,7 +12,7 @@ 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 @@
@@ -295,8 +292,6 @@
gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0'

View file

@ -1,7 +1,7 @@
--- a/Gemfile
+++ b/Gemfile
@@ -373,7 +373,7 @@
gem 'rspec_profiling', '~> 0.0.6'
@@ -341,7 +341,7 @@
gem 'rspec-benchmark', '~> 0.6.0'
gem 'rspec-parameterized', require: false
- gem 'capybara', '~> 3.35', '~> 3.35.3'

View file

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

View file

@ -1,8 +1,8 @@
--- a/Gemfile
+++ b/Gemfile
@@ -383,7 +383,6 @@
@@ -351,7 +351,6 @@
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 1.0.7'
gem 'test-prof', '~> 1.0', '>= 1.0.7'
gem 'rspec_junit_formatter'
- gem 'guard-rspec'

View file

@ -2,7 +2,7 @@ newer version is in the archive
--- a/Gemfile
+++ b/Gemfile
@@ -97,7 +97,7 @@
@@ -99,7 +99,7 @@
gem 'graphql', '~> 1.11', '>= 1.11.10'
gem 'graphiql-rails', '~> 1.8'
gem 'apollo_upload_server', '~> 2.1'

View file

@ -2,7 +2,7 @@ libruby2.7 has rexml 3.2.3.1 which has latest security fixes
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@
@@ -33,7 +33,7 @@
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
gem 'doorkeeper', '~> 5.5'
gem 'doorkeeper-openid_connect', '~> 1.7','>= 1.7.5'

View file

@ -1,8 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -492,4 +492,4 @@
gem 'parslet', '~> 1.8'
-gem 'ipynbdiff', '0.3.8'
+gem 'ipynbdiff', '~> 0.3.8'

View file

@ -2,7 +2,7 @@ Forwarded: https://gitlab.com/gitlab-org/gitlab/-/issues/354323
--- a/Gemfile
+++ b/Gemfile
@@ -17,6 +17,9 @@
@@ -19,6 +19,9 @@
# Supported DBs
gem 'pg', '~> 1.1'

View file

@ -2,12 +2,12 @@ These are not required in production
--- a/package.json
+++ b/package.json
@@ -201,62 +201,7 @@
@@ -199,62 +199,7 @@
"yaml": "^2.0.0-10"
},
"devDependencies": {
- "@babel/plugin-transform-modules-commonjs": "^7.10.1",
- "@gitlab/eslint-plugin": "10.0.0",
- "@gitlab/eslint-plugin": "11.0.0",
- "@gitlab/stylelint-config": "4.0.0",
- "@graphql-eslint/eslint-plugin": "3.0.0",
- "@testing-library/dom": "^7.16.2",

View file

@ -27,7 +27,7 @@ Use debian packaged node modules when available
const { StatsWriterPlugin } = require('webpack-stats-plugin');
const WEBPACK_VERSION = require('webpack/package.json').version;
@@ -238,6 +237,8 @@
@@ -237,6 +236,8 @@
entry: generateEntries,
@ -36,7 +36,7 @@ Use debian packaged node modules when available
output: {
path: WEBPACK_OUTPUT_PATH,
publicPath: WEBPACK_PUBLIC_PATH,
@@ -247,10 +248,15 @@
@@ -246,10 +247,15 @@
},
resolve: {
@ -53,7 +53,7 @@ Use debian packaged node modules when available
module: {
strictExportPresence: true,
rules: [
@@ -349,7 +355,7 @@
@@ -348,7 +354,7 @@
},
{
test: /\.(eot|ttf|woff|woff2)$/,
@ -62,7 +62,7 @@ Use debian packaged node modules when available
loader: 'file-loader',
options: {
name: '[name].[contenthash:8].[ext]',
@@ -656,19 +662,6 @@
@@ -659,19 +665,6 @@
},
},
@ -82,7 +82,7 @@ Use debian packaged node modules when available
new webpack.DefinePlugin({
// 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),
@@ -726,6 +719,7 @@
@@ -736,6 +729,7 @@
node: {
fs: 'empty', // sqljs requires fs
@ -110,8 +110,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": "2.5.0",
"@gitlab/ui": "36.6.0",
"@gitlab/svgs": "2.6.0",
"@gitlab/ui": "37.3.0",
"@gitlab/visual-review-tools": "1.6.1",
- "@rails/actioncable": "6.1.4-6",
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
@ -155,7 +155,7 @@ Use debian packaged node modules when available
+ "jszip-utils": "link:/usr/share/nodejs/jszip-utils",
+ "katex": "link:/usr/share/nodejs/katex",
+ "lodash": "link:/usr/share/nodejs/lodash",
"lowlight": "^1.20.0",
"lowlight": "^2.5.0",
"marked": "^0.3.12",
"mathjax": "3",
"mermaid": "^8.13.10",
@ -174,26 +174,24 @@ Use debian packaged node modules when available
"portal-vue": "^2.1.7",
"postcss": "8.4.5",
"prismjs": "^1.21.0",
- "prosemirror-markdown": "1.6.0",
- "prosemirror-markdown": "1.7.1",
- "prosemirror-model": "^1.16.1",
- "prosemirror-state": "^1.3.4",
+ "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
+ "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
+ "prosemirror-state": "link:/usr/share/nodejs/prosemirror-state",
"prosemirror-tables": "^1.1.1",
"prosemirror-view": "^1.23.6",
"prosemirror-view": "^1.23.7",
"raphael": "^2.2.7",
@@ -173,27 +173,27 @@
@@ -173,25 +173,24 @@
"style-loader": "^2.0.0",
"swagger-ui-dist": "4.8.0",
"three": "^0.84.0",
- "three-orbit-controls": "^82.1.0",
+ "three-orbit-controls": "link:/usr/share/nodejs/three-orbit-controls",
"three-stl-loader": "^1.0.4",
"timeago.js": "^4.0.2",
- "timeago.js": "^4.0.2",
+ "timeago.js": "link:/usr/share/nodejs/timeago.js",
"tiptap": "^1.32.2",
"tiptap-extensions": "^1.35.2",
"url-loader": "^4.1.1",
- "uuid": "8.1.0",
+ "uuid": "link:/usr/share/nodejs/uuid",

View file

@ -65,7 +65,7 @@ Subject: [PATCH] Update node module js-cookies from ^2.2.1 to ^3.0.0
// bootstrap webpack, common libs, polyfills, and behaviors
import './webpack';
@@ -169,9 +168,6 @@
@@ -177,9 +176,6 @@
initLayoutNav();
initAlertHandler();
@ -204,7 +204,7 @@ Subject: [PATCH] Update node module js-cookies from ^2.2.1 to ^3.0.0
import IssuableSidebarRoot from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
--- a/yarn.lock
+++ b/yarn.lock
@@ -7567,10 +7567,10 @@
@@ -7581,10 +7581,10 @@
mkdirp "~1.0.3"
nopt "^4.0.3"

View file

@ -12,7 +12,6 @@ Gemfile/0130-remove-capybara-screenshot.patch
Gemfile/0140-remove-guard-rspec.patch
Gemfile/0150-relax-graphlient.patch
Gemfile/0160-relax-rexml.patch
Gemfile/0170-relax-ipynbdiff.patch
Gemfile/0180-add-parser-gem.patch
nodejs/0010-set-webpack-root.patch
nodejs/0020-remove-dev-dependencies.patch

View file

@ -7,6 +7,6 @@ require_relative does not work with debian package layout
<%
- require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
+ require "/usr/share/gitlab/lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
Gitlab::MailRoom.enabled_configs.each do |_key, config|
Gitlab::MailRoom.enabled_configs.each do |key, config|
%>
-