Refresh patches
This commit is contained in:
Pirate Praveen
parent
2863444a25
commit
6832e9f529
7 changed files with 90 additions and 88 deletions
|
|
@ -7,8 +7,8 @@ gitlab Gemfile
|
|||
|
||||
source 'https://rubygems.org'
|
||||
|
||||
-gem 'rails', '~> 6.1.4.4'
|
||||
+gem 'rails', '~> 6.1.4', '>= 6.1.4.4'
|
||||
-gem 'rails', '~> 6.1.4.6'
|
||||
+gem 'rails', '~> 6.1.4', '>= 6.1.4.6'
|
||||
|
||||
-gem 'bootsnap', '~> 1.9.1', require: false
|
||||
+gem 'bootsnap', '~> 1.9', '>= 1.9.1', require: false
|
||||
|
|
@ -101,9 +101,9 @@ gitlab Gemfile
|
|||
|
||||
# GitLab Pages
|
||||
-gem 'validates_hostname', '~> 1.0.11'
|
||||
-gem 'rubyzip', '~> 2.0.0', require: 'zip'
|
||||
-gem 'rubyzip', '~> 2.3.2', require: 'zip'
|
||||
+gem 'validates_hostname', '~> 1.0', '>= 1.0.11'
|
||||
+gem 'rubyzip', '~> 2.0', require: 'zip'
|
||||
+gem 'rubyzip', '~> 2.0', '>= 2.3.2', require: 'zip'
|
||||
# GitLab Pages letsencrypt support
|
||||
gem 'acme-client', '~> 2.0', '>= 2.0.9'
|
||||
|
||||
|
|
@ -225,14 +225,14 @@ gitlab Gemfile
|
|||
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
|
||||
|
||||
group :puma do
|
||||
- gem 'puma', '~> 5.5.2', require: false
|
||||
+ gem 'puma', '~> 5.5', '>= 5.5.2', require: false
|
||||
- gem 'puma', '~> 5.6.2', require: false
|
||||
+ gem 'puma', '~> 5.6', '>= 5.6.2', require: false
|
||||
gem 'puma_worker_killer', '~> 0.3.1', require: false
|
||||
gem 'sd_notify', '~> 0.1.0', require: false
|
||||
end
|
||||
@@ -197,11 +197,11 @@
|
||||
# Background jobs
|
||||
gem 'sidekiq', '~> 6.3'
|
||||
gem 'sidekiq', '~> 6.4'
|
||||
gem 'sidekiq-cron', '~> 1.2'
|
||||
-gem 'redis-namespace', '~> 1.8.1'
|
||||
+gem 'redis-namespace', '~> 1.8','>= 1.8.1'
|
||||
|
|
@ -330,7 +330,8 @@ gitlab Gemfile
|
|||
gem 'request_store', '~> 1.5'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
gem 'gitlab-license', '~> 2.0'
|
||||
-gem 'gitlab-license', '~> 2.1.0'
|
||||
+gem 'gitlab-license', '~> 2.1'
|
||||
|
||||
# Protect against bruteforcing
|
||||
-gem 'rack-attack', '~> 6.3.0'
|
||||
|
|
@ -346,7 +347,7 @@ gitlab Gemfile
|
|||
+gem 'premailer-rails', '~> 1.10','>= 1.10.3'
|
||||
|
||||
# LabKit: Tracing and Correlation
|
||||
gem 'gitlab-labkit', '~> 0.21.3'
|
||||
gem 'gitlab-labkit', '~> 0.22.0'
|
||||
@@ -318,11 +318,11 @@
|
||||
# I18n
|
||||
gem 'ruby_parser', '~> 3.15', require: false
|
||||
|
|
@ -421,12 +422,12 @@ gitlab Gemfile
|
|||
|
||||
# NTP client
|
||||
gem 'net-ntp'
|
||||
@@ -480,14 +480,14 @@
|
||||
@@ -473,14 +473,14 @@
|
||||
gem 'spamcheck', '~> 0.1.0'
|
||||
|
||||
# Gitaly GRPC protocol definitions
|
||||
-gem 'gitaly', '~> 14.6.0.pre.rc1'
|
||||
+gem 'gitaly', '~> 14.6'
|
||||
-gem 'gitaly', '~> 14.8.0.pre.rc1'
|
||||
+gem 'gitaly', '~> 14.8'
|
||||
|
||||
# KAS GRPC protocol definitions
|
||||
gem 'kas-grpc', '~> 0.0.2'
|
||||
|
|
@ -439,16 +440,16 @@ gitlab Gemfile
|
|||
|
||||
gem 'toml-rb', '~> 2.0'
|
||||
|
||||
@@ -495,7 +495,7 @@
|
||||
@@ -488,7 +488,7 @@
|
||||
gem 'flipper', '~> 0.21.0'
|
||||
gem 'flipper-active_record', '~> 0.21.0'
|
||||
gem 'flipper-active_support_cache_store', '~> 0.21.0'
|
||||
-gem 'unleash', '~> 3.2.2'
|
||||
+gem 'unleash', '~> 3.2', '>= 3.2.2'
|
||||
gem 'gitlab-experiment', '~> 0.6.5'
|
||||
gem 'gitlab-experiment', '~> 0.7.0'
|
||||
|
||||
# Structured logging
|
||||
@@ -508,12 +508,12 @@
|
||||
@@ -501,12 +501,12 @@
|
||||
# Countries list
|
||||
gem 'countries', '~> 3.0'
|
||||
|
||||
|
|
@ -463,7 +464,7 @@ gitlab Gemfile
|
|||
|
||||
# Locked as long as quoted-printable encoding issues are not resolved
|
||||
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
|
||||
@@ -528,11 +528,11 @@
|
||||
@@ -521,11 +521,11 @@
|
||||
gem 'valid_email', '~> 0.1'
|
||||
|
||||
# JSON
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ Bundler will fail when it can't find these locally
|
|||
|
||||
gem 'batch-loader', '~> 2.0', '>= 2.0.1'
|
||||
|
||||
@@ -337,21 +335,6 @@
|
||||
@@ -337,83 +335,6 @@
|
||||
|
||||
gem 'warning', '~> 1.2'
|
||||
|
||||
|
|
@ -37,25 +37,51 @@ Bundler will fail when it can't find these locally
|
|||
- gem 'sprite-factory', '~> 1.7'
|
||||
-end
|
||||
-
|
||||
group :development, :test do
|
||||
gem 'deprecation_toolkit', '~> 1.5.1', require: false
|
||||
gem 'bullet', '~> 6.1.3'
|
||||
@@ -374,9 +357,6 @@
|
||||
gem 'spring', '~> 2.1.0'
|
||||
gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
|
||||
-group :development, :test do
|
||||
- gem 'deprecation_toolkit', '~> 1.5.1', require: false
|
||||
- gem 'bullet', '~> 6.1.3'
|
||||
- gem 'pry-byebug'
|
||||
- gem 'pry-rails', '~> 0.3.9'
|
||||
- gem 'pry-shell', '~> 0.5.0'
|
||||
-
|
||||
- gem 'awesome_print', require: false
|
||||
-
|
||||
- gem 'database_cleaner', '~> 1.7.0'
|
||||
- gem 'factory_bot_rails', '~> 6.2.0'
|
||||
- gem 'rspec-rails', '~> 5.0.1'
|
||||
-
|
||||
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
||||
- gem 'minitest', '~> 5.11.0'
|
||||
-
|
||||
- # Generate Fake data
|
||||
- gem 'ffaker', '~> 2.10'
|
||||
-
|
||||
- gem 'spring', '~> 2.1.0'
|
||||
- gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
-
|
||||
- gem 'gitlab-styles', '~> 6.6.0', require: false
|
||||
-
|
||||
- gem 'haml_lint', '~> 0.36.0', require: false
|
||||
gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
|
||||
gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||
@@ -395,25 +375,6 @@
|
||||
gem 'test_file_finder', '~> 0.1.3'
|
||||
end
|
||||
|
||||
- gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
-
|
||||
- gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||
-
|
||||
- gem 'knapsack', '~> 1.21.1'
|
||||
- gem 'crystalball', '~> 0.7.0', require: false
|
||||
-
|
||||
- gem 'simple_po_parser', '~> 1.1.2', require: false
|
||||
-
|
||||
- gem 'timecop', '~> 0.9.1'
|
||||
-
|
||||
- gem 'png_quantizator', '~> 0.2.1', require: false
|
||||
-
|
||||
- gem 'parallel', '~> 1.19', require: false
|
||||
-
|
||||
- gem 'test_file_finder', '~> 0.1.3'
|
||||
-end
|
||||
-
|
||||
-group :development, :test, :danger do
|
||||
- gem 'gitlab-dangerfiles', '~> 2.6.1', require: false
|
||||
- gem 'gitlab-dangerfiles', '~> 2.8.0', require: false
|
||||
-end
|
||||
-
|
||||
-group :development, :test, :coverage do
|
||||
|
|
|
|||
|
|
@ -6,18 +6,8 @@ Make test dependencies conditional so we can enable them when running autopkgtes
|
|||
|
||||
gem 'warning', '~> 1.2'
|
||||
|
||||
-group :development, :test do
|
||||
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
|
||||
gem 'deprecation_toolkit', '~> 1.5.1', require: false
|
||||
gem 'bullet', '~> 6.1.3'
|
||||
gem 'pry-byebug'
|
||||
@@ -373,9 +373,7 @@
|
||||
gem 'parallel', '~> 1.19', require: false
|
||||
|
||||
gem 'test_file_finder', '~> 0.1.3'
|
||||
-end
|
||||
|
||||
-group :test do
|
||||
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
|
||||
gem 'fuubar', '~> 2.2'
|
||||
gem 'rspec-retry', '~> 0.6.1'
|
||||
gem 'rspec_profiling', '~> 0.0.6'
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ This gem is used only in gitlab Enterprise Edition
|
|||
gem 'request_store', '~> 1.5'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
-gem 'gitlab-license', '~> 2.0'
|
||||
-gem 'gitlab-license', '~> 2.1'
|
||||
-
|
||||
# Protect against bruteforcing
|
||||
gem 'rack-attack', '~> 6.3'
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@ These are not required in production
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -207,62 +207,7 @@
|
||||
"yaml": "^2.0.0-8"
|
||||
@@ -201,62 +201,7 @@
|
||||
"yaml": "^2.0.0-10"
|
||||
},
|
||||
"devDependencies": {
|
||||
- "@babel/plugin-transform-modules-commonjs": "^7.10.1",
|
||||
- "@gitlab/eslint-plugin": "10.0.0",
|
||||
- "@gitlab/stylelint-config": "2.6.0",
|
||||
- "@gitlab/stylelint-config": "4.0.0",
|
||||
- "@graphql-eslint/eslint-plugin": "3.0.0",
|
||||
- "@testing-library/dom": "^7.16.2",
|
||||
- "@vue/test-utils": "1.3.0",
|
||||
|
|
@ -42,12 +42,11 @@ These are not required in production
|
|||
- "jest-util": "^26.5.2",
|
||||
- "jsdoc": "^3.5.5",
|
||||
- "jsdoc-vue": "^1.0.0",
|
||||
- "markdownlint-cli": "0.26.0",
|
||||
- "markdownlint-cli": "0.31.0",
|
||||
- "md5": "^2.2.1",
|
||||
- "miragejs": "^0.1.40",
|
||||
- "mock-apollo-client": "^0.7.0",
|
||||
- "mock-apollo-client": "1.2.0",
|
||||
- "nodemon": "^2.0.4",
|
||||
- "postcss": "^7.0.14",
|
||||
- "prettier": "2.2.1",
|
||||
- "prosemirror-schema-basic": "^1.1.2",
|
||||
- "prosemirror-schema-list": "^1.1.6",
|
||||
|
|
@ -55,9 +54,10 @@ These are not required in production
|
|||
- "purgecss": "^4.0.3",
|
||||
- "purgecss-from-html": "^4.0.3",
|
||||
- "sass": "^1.32.12",
|
||||
- "stylelint": "^14.3.0",
|
||||
- "timezone-mock": "^1.0.8",
|
||||
- "vue-jest": "4.0.1",
|
||||
- "webpack-dev-server": "^3.11.3",
|
||||
- "webpack-dev-server": "4.7.4",
|
||||
- "xhr-mock": "^2.5.1",
|
||||
- "yarn-check-webpack-plugin": "^1.2.0",
|
||||
- "yarn-deduplicate": "^3.1.0"
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
@@ -236,6 +235,8 @@
|
||||
@@ -238,6 +237,8 @@
|
||||
|
||||
entry: generateEntries,
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ Use debian packaged node modules when available
|
|||
output: {
|
||||
path: WEBPACK_OUTPUT_PATH,
|
||||
publicPath: WEBPACK_PUBLIC_PATH,
|
||||
@@ -245,10 +246,15 @@
|
||||
@@ -247,10 +248,15 @@
|
||||
},
|
||||
|
||||
resolve: {
|
||||
|
|
@ -53,22 +53,7 @@ Use debian packaged node modules when available
|
|||
module: {
|
||||
strictExportPresence: true,
|
||||
rules: [
|
||||
@@ -259,9 +265,13 @@
|
||||
},
|
||||
{
|
||||
test: /\.js$/,
|
||||
- exclude: (modulePath) =>
|
||||
+ exclude: [(modulePath) =>
|
||||
/node_modules\/(?!tributejs)|node_modules|vendor[\\/]assets/.test(modulePath) &&
|
||||
!/\.vue\.js/.test(modulePath),
|
||||
+ /\/usr\/share\/nodejs/,
|
||||
+ /\/usr\/lib\/nodejs/,
|
||||
+ /\/usr\/share\/javascript/
|
||||
+ ],
|
||||
loader: 'babel-loader',
|
||||
options: {
|
||||
cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
|
||||
@@ -348,7 +358,7 @@
|
||||
@@ -349,7 +355,7 @@
|
||||
},
|
||||
{
|
||||
test: /\.(eot|ttf|woff|woff2)$/,
|
||||
|
|
@ -77,9 +62,9 @@ Use debian packaged node modules when available
|
|||
loader: 'file-loader',
|
||||
options: {
|
||||
name: '[name].[contenthash:8].[ext]',
|
||||
@@ -658,19 +668,6 @@
|
||||
// enable HMR only in webpack-dev-server
|
||||
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
|
||||
@@ -656,19 +662,6 @@
|
||||
},
|
||||
},
|
||||
|
||||
- // optionally generate webpack bundle analysis
|
||||
- WEBPACK_REPORT &&
|
||||
|
|
@ -97,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),
|
||||
@@ -709,6 +706,7 @@
|
||||
@@ -726,6 +719,7 @@
|
||||
|
||||
node: {
|
||||
fs: 'empty', // sqljs requires fs
|
||||
|
|
@ -107,10 +92,10 @@ Use debian packaged node modules when available
|
|||
};
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -48,19 +48,19 @@
|
||||
"webpack-prod-node-latest": "NODE_OPTIONS=\"--max-old-space-size=3584 --openssl-legacy-provider\" NODE_ENV=production webpack --config config/webpack.config.js"
|
||||
@@ -48,18 +48,18 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@apollo/client": "^3.3.11",
|
||||
- "@babel/core": "^7.10.1",
|
||||
- "@babel/plugin-proposal-class-properties": "^7.10.1",
|
||||
- "@babel/plugin-proposal-json-strings": "^7.10.1",
|
||||
|
|
@ -125,16 +110,15 @@ 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.2.0",
|
||||
"@gitlab/tributejs": "1.0.0",
|
||||
"@gitlab/ui": "32.68.0",
|
||||
"@gitlab/svgs": "2.5.0",
|
||||
"@gitlab/ui": "36.6.0",
|
||||
"@gitlab/visual-review-tools": "1.6.1",
|
||||
- "@rails/actioncable": "6.1.4-1",
|
||||
- "@rails/actioncable": "6.1.4-6",
|
||||
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
|
||||
"@rails/ujs": "6.1.4-1",
|
||||
"@rails/ujs": "6.1.4-6",
|
||||
"@sentry/browser": "5.30.0",
|
||||
"@sourcegraph/code-host-integration": "0.0.60",
|
||||
@@ -107,7 +107,7 @@
|
||||
@@ -100,7 +100,7 @@
|
||||
"aws-sdk": "^2.637.0",
|
||||
"axios": "^0.24.0",
|
||||
"babel-loader": "^8.2.2",
|
||||
|
|
@ -143,7 +127,7 @@ Use debian packaged node modules when available
|
|||
"bootstrap": "4.5.3",
|
||||
"cache-loader": "^4.1.0",
|
||||
"canvas-confetti": "^1.4.0",
|
||||
@@ -142,30 +142,30 @@
|
||||
@@ -135,31 +135,31 @@
|
||||
"jed": "^1.1.1",
|
||||
"jquery": "^3.6.0",
|
||||
"jquery.caret": "^0.3.1",
|
||||
|
|
@ -175,6 +159,7 @@ Use debian packaged node modules when available
|
|||
- "popper.js": "^1.16.1",
|
||||
+ "popper.js": "link:/usr/share/nodejs/popper.js",
|
||||
"portal-vue": "^2.1.7",
|
||||
"postcss": "8.4.5",
|
||||
"prismjs": "^1.21.0",
|
||||
- "prosemirror-markdown": "1.6.0",
|
||||
- "prosemirror-model": "^1.16.1",
|
||||
|
|
@ -183,16 +168,16 @@ Use debian packaged node modules when available
|
|||
+ "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.5",
|
||||
"prosemirror-view": "^1.23.6",
|
||||
"raphael": "^2.2.7",
|
||||
@@ -179,27 +179,26 @@
|
||||
@@ -173,27 +173,27 @@
|
||||
"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",
|
||||
|
|
@ -202,7 +187,7 @@ Use debian packaged node modules when available
|
|||
"visibilityjs": "^1.2.4",
|
||||
- "vue": "^2.6.12",
|
||||
+ "vue": "link:/usr/share/nodejs/vue",
|
||||
"vue-apollo": "^3.0.3",
|
||||
"vue-apollo": "^3.0.7",
|
||||
"vue-loader": "^15.9.6",
|
||||
"vue-observe-visibility": "^1.0.0",
|
||||
"vue-resize": "^1.0.1",
|
||||
|
|
@ -215,7 +200,7 @@ Use debian packaged node modules when available
|
|||
"web-vitals": "^0.2.4",
|
||||
"webpack": "^4.46.0",
|
||||
- "webpack-bundle-analyzer": "^4.4.2",
|
||||
"webpack-cli": "^3.3.12",
|
||||
"webpack-cli": "^4.9.2",
|
||||
"webpack-stats-plugin": "^0.3.1",
|
||||
"worker-loader": "^2.0.0",
|
||||
--- a/babel.config.js
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -154,7 +154,7 @@
|
||||
@@ -147,7 +147,7 @@
|
||||
"mermaid": "^8.13.10",
|
||||
"minimatch": "link:/usr/share/nodejs/minimatch",
|
||||
"monaco-editor": "^0.25.2",
|
||||
|
|
|
|||
Loading…
Reference in a new issue