Refresh patches and create Gemfile subdirectory for patches
This commit is contained in:
Pirate Praveen
parent
8804f2dc83
commit
716d398d41
22 changed files with 67 additions and 131 deletions
|
|
@ -2,12 +2,12 @@ These are not required in production
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -204,72 +204,7 @@
|
||||
@@ -202,61 +202,7 @@
|
||||
"xterm": "3.14.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
- "@babel/plugin-transform-modules-commonjs": "^7.10.1",
|
||||
- "@gitlab/eslint-plugin": "9.0.2",
|
||||
- "@gitlab/eslint-plugin": "9.3.0",
|
||||
- "@gitlab/stylelint-config": "2.3.0",
|
||||
- "@testing-library/dom": "^7.16.2",
|
||||
- "@vue/test-utils": "1.2.0",
|
||||
|
|
@ -21,10 +21,9 @@ These are not required in production
|
|||
- "commander": "^2.20.3",
|
||||
- "custom-jquery-matchers": "^2.1.0",
|
||||
- "docdash": "^1.0.2",
|
||||
- "eslint": "7.31.0",
|
||||
- "eslint": "7.32.0",
|
||||
- "eslint-import-resolver-jest": "3.0.0",
|
||||
- "eslint-import-resolver-webpack": "0.13.1",
|
||||
- "eslint-plugin-jasmine": "4.1.2",
|
||||
- "eslint-plugin-no-jquery": "2.6.0",
|
||||
- "gettext-extractor": "^3.5.3",
|
||||
- "gettext-extractor-vue": "^5.0.0",
|
||||
|
|
@ -32,9 +31,6 @@ These are not required in production
|
|||
- "istanbul-lib-coverage": "^3.0.0",
|
||||
- "istanbul-lib-report": "^3.0.0",
|
||||
- "istanbul-reports": "^3.0.0",
|
||||
- "jasmine-core": "^2.9.0",
|
||||
- "jasmine-diff": "^0.1.3",
|
||||
- "jasmine-jquery": "^2.1.1",
|
||||
- "jest": "^26.5.2",
|
||||
- "jest-canvas-mock": "^2.1.2",
|
||||
- "jest-environment-jsdom": "^26.5.2",
|
||||
|
|
@ -44,14 +40,6 @@ These are not required in production
|
|||
- "jest-util": "^26.5.2",
|
||||
- "jsdoc": "^3.5.5",
|
||||
- "jsdoc-vue": "^1.0.0",
|
||||
- "karma": "^4.2.0",
|
||||
- "karma-chrome-launcher": "^3.0.0",
|
||||
- "karma-coverage-istanbul-reporter": "^2.1.0",
|
||||
- "karma-jasmine": "^1.1.2",
|
||||
- "karma-junit-reporter": "^1.2.0",
|
||||
- "karma-mocha-reporter": "^2.2.5",
|
||||
- "karma-sourcemap-loader": "^0.3.7",
|
||||
- "karma-webpack": "^4.0.2",
|
||||
- "markdownlint-cli": "0.26.0",
|
||||
- "md5": "^2.2.1",
|
||||
- "miragejs": "^0.1.40",
|
||||
|
|
@ -60,6 +48,7 @@ These are not required in production
|
|||
- "postcss": "^7.0.14",
|
||||
- "prettier": "2.2.1",
|
||||
- "prosemirror-schema-basic": "^1.1.2",
|
||||
- "prosemirror-schema-list": "^1.1.5",
|
||||
- "prosemirror-test-builder": "^1.0.4",
|
||||
- "purgecss": "^4.0.3",
|
||||
- "purgecss-from-html": "^4.0.3",
|
||||
|
|
|
|||
46
debian/patches/0740-use-packaged-modules.patch
vendored
46
debian/patches/0740-use-packaged-modules.patch
vendored
|
|
@ -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;
|
||||
|
||||
@@ -217,6 +216,8 @@
|
||||
@@ -223,6 +222,8 @@
|
||||
|
||||
entry: generateEntries,
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ Use debian packaged node modules when available
|
|||
output: {
|
||||
path: WEBPACK_OUTPUT_PATH,
|
||||
publicPath: WEBPACK_PUBLIC_PATH,
|
||||
@@ -226,10 +227,15 @@
|
||||
@@ -232,10 +233,15 @@
|
||||
},
|
||||
|
||||
resolve: {
|
||||
|
|
@ -53,7 +53,7 @@ Use debian packaged node modules when available
|
|||
module: {
|
||||
strictExportPresence: true,
|
||||
rules: [
|
||||
@@ -240,9 +246,13 @@
|
||||
@@ -246,9 +252,13 @@
|
||||
},
|
||||
{
|
||||
test: /\.js$/,
|
||||
|
|
@ -68,7 +68,7 @@ Use debian packaged node modules when available
|
|||
loader: 'babel-loader',
|
||||
options: {
|
||||
cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
|
||||
@@ -329,7 +339,7 @@
|
||||
@@ -335,7 +345,7 @@
|
||||
},
|
||||
{
|
||||
test: /\.(eot|ttf|woff|woff2)$/,
|
||||
|
|
@ -77,7 +77,7 @@ Use debian packaged node modules when available
|
|||
loader: 'file-loader',
|
||||
options: {
|
||||
name: '[name].[contenthash:8].[ext]',
|
||||
@@ -620,19 +630,6 @@
|
||||
@@ -635,19 +645,6 @@
|
||||
// enable HMR only in webpack-dev-server
|
||||
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
|
||||
|
||||
|
|
@ -95,9 +95,9 @@ 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:
|
||||
// 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),
|
||||
@@ -669,6 +666,7 @@
|
||||
@@ -686,6 +683,7 @@
|
||||
|
||||
node: {
|
||||
fs: 'empty', // sqljs requires fs
|
||||
|
|
@ -107,7 +107,7 @@ Use debian packaged node modules when available
|
|||
};
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -49,19 +49,19 @@
|
||||
@@ -47,19 +47,19 @@
|
||||
"webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
|
||||
},
|
||||
"dependencies": {
|
||||
|
|
@ -125,16 +125,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.211.0",
|
||||
"@gitlab/svgs": "1.212.0",
|
||||
"@gitlab/tributejs": "1.0.0",
|
||||
"@gitlab/ui": "32.2.1",
|
||||
"@gitlab/ui": "32.11.0",
|
||||
"@gitlab/visual-review-tools": "1.6.1",
|
||||
- "@rails/actioncable": "6.1.3-2",
|
||||
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
|
||||
"@rails/ujs": "6.1.3-2",
|
||||
"@sentry/browser": "5.26.0",
|
||||
"@sourcegraph/code-host-integration": "0.0.59",
|
||||
@@ -107,7 +107,7 @@
|
||||
"@sentry/browser": "5.30.0",
|
||||
"@sourcegraph/code-host-integration": "0.0.60",
|
||||
@@ -105,7 +105,7 @@
|
||||
"aws-sdk": "^2.637.0",
|
||||
"axios": "^0.20.0",
|
||||
"babel-loader": "^8.2.2",
|
||||
|
|
@ -143,10 +143,10 @@ Use debian packaged node modules when available
|
|||
"bootstrap": "4.5.3",
|
||||
"cache-loader": "^4.1.0",
|
||||
"clipboard": "^1.7.1",
|
||||
@@ -141,30 +141,30 @@
|
||||
@@ -138,31 +138,31 @@
|
||||
"jed": "^1.1.1",
|
||||
"jquery": "^3.6.0",
|
||||
"jquery.caret": "^0.3.1",
|
||||
"jquery.waitforimages": "^2.2.0",
|
||||
- "js-cookie": "^2.2.1",
|
||||
- "js-yaml": "^3.13.1",
|
||||
- "jszip": "^3.1.3",
|
||||
|
|
@ -162,7 +162,7 @@ Use debian packaged node modules when available
|
|||
"lowlight": "^1.20.0",
|
||||
"marked": "^0.3.12",
|
||||
"mathjax": "3",
|
||||
"mermaid": "^8.10.2",
|
||||
"mermaid": "^8.11.5",
|
||||
- "minimatch": "^3.0.4",
|
||||
+ "minimatch": "link:/usr/share/nodejs/minimatch",
|
||||
"monaco-editor": "^0.25.2",
|
||||
|
|
@ -178,14 +178,16 @@ Use debian packaged node modules when available
|
|||
"portal-vue": "^2.1.7",
|
||||
"prismjs": "^1.21.0",
|
||||
"prosemirror-inputrules": "^1.1.3",
|
||||
- "prosemirror-markdown": "^1.5.1",
|
||||
- "prosemirror-model": "^1.13.3",
|
||||
- "prosemirror-markdown": "^1.5.2",
|
||||
- "prosemirror-model": "^1.14.3",
|
||||
- "prosemirror-state": "^1.3.4",
|
||||
+ "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
|
||||
+ "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
|
||||
"prosemirror-state": "^1.3.4",
|
||||
+ "prosemirror-state": "link:/usr/share/nodejs/prosemirror-state",
|
||||
"prosemirror-tables": "^1.1.1",
|
||||
"raphael": "^2.2.7",
|
||||
"raw-loader": "^4.0.2",
|
||||
@@ -177,27 +177,26 @@
|
||||
@@ -175,27 +175,26 @@
|
||||
"style-loader": "^2.0.0",
|
||||
"swagger-ui-dist": "^3.44.1",
|
||||
"three": "^0.84.0",
|
||||
|
|
@ -194,8 +196,8 @@ Use debian packaged node modules when available
|
|||
"three-stl-loader": "^1.0.4",
|
||||
- "timeago.js": "^4.0.2",
|
||||
+ "timeago.js": "link:/usr/share/nodejs/timeago.js",
|
||||
"tiptap": "^1.32.1",
|
||||
"tiptap-extensions": "^1.35.1",
|
||||
"tiptap": "^1.32.2",
|
||||
"tiptap-extensions": "^1.35.2",
|
||||
"url-loader": "^4.1.1",
|
||||
- "uuid": "8.1.0",
|
||||
+ "uuid": "link:/usr/share/nodejs/uuid",
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -153,7 +153,7 @@
|
||||
"mermaid": "^8.10.2",
|
||||
@@ -150,7 +150,7 @@
|
||||
"mermaid": "^8.11.5",
|
||||
"minimatch": "link:/usr/share/nodejs/minimatch",
|
||||
"monaco-editor": "^0.25.2",
|
||||
- "monaco-editor-webpack-plugin": "^4.0.0",
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
Use matching version of @tiptap/core and extentions
|
||||
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -65,24 +65,24 @@
|
||||
"@rails/ujs": "6.1.3-2",
|
||||
"@sentry/browser": "5.26.0",
|
||||
"@sourcegraph/code-host-integration": "0.0.59",
|
||||
- "@tiptap/core": "^2.0.0-beta.86",
|
||||
- "@tiptap/extension-blockquote": "^2.0.0-beta.14",
|
||||
+ "@tiptap/core": "2.0.0-beta.86",
|
||||
+ "@tiptap/extension-blockquote": "2.0.0-beta.14",
|
||||
"@tiptap/extension-bold": "^2.0.0-beta.14",
|
||||
- "@tiptap/extension-bullet-list": "^2.0.0-beta.14",
|
||||
+ "@tiptap/extension-bullet-list": "2.0.0-beta.14",
|
||||
"@tiptap/extension-code": "^2.0.0-beta.14",
|
||||
"@tiptap/extension-code-block-lowlight": "2.0.0-beta.32",
|
||||
"@tiptap/extension-document": "^2.0.0-beta.12",
|
||||
"@tiptap/extension-dropcursor": "^2.0.0-beta.17",
|
||||
"@tiptap/extension-gapcursor": "^2.0.0-beta.18",
|
||||
"@tiptap/extension-hard-break": "^2.0.0-beta.14",
|
||||
- "@tiptap/extension-heading": "^2.0.0-beta.14",
|
||||
+ "@tiptap/extension-heading": "2.0.0-beta.14",
|
||||
"@tiptap/extension-history": "^2.0.0-beta.14",
|
||||
"@tiptap/extension-horizontal-rule": "^2.0.0-beta.17",
|
||||
"@tiptap/extension-image": "^2.0.0-beta.14",
|
||||
"@tiptap/extension-italic": "^2.0.0-beta.14",
|
||||
"@tiptap/extension-link": "^2.0.0-beta.18",
|
||||
"@tiptap/extension-list-item": "^2.0.0-beta.13",
|
||||
- "@tiptap/extension-ordered-list": "^2.0.0-beta.14",
|
||||
+ "@tiptap/extension-ordered-list": "2.0.0-beta.14",
|
||||
"@tiptap/extension-paragraph": "^2.0.0-beta.15",
|
||||
"@tiptap/extension-strike": "^2.0.0-beta.16",
|
||||
"@tiptap/extension-subscript": "^2.0.0-beta.4",
|
||||
@@ -91,8 +91,8 @@
|
||||
"@tiptap/extension-table-cell": "^2.0.0-beta.13",
|
||||
"@tiptap/extension-table-header": "^2.0.0-beta.15",
|
||||
"@tiptap/extension-table-row": "^2.0.0-beta.13",
|
||||
- "@tiptap/extension-task-item": "^2.0.0-beta.17",
|
||||
- "@tiptap/extension-task-list": "^2.0.0-beta.17",
|
||||
+ "@tiptap/extension-task-item": "2.0.0-beta.17",
|
||||
+ "@tiptap/extension-task-list": "2.0.0-beta.17",
|
||||
"@tiptap/extension-text": "^2.0.0-beta.12",
|
||||
"@tiptap/vue-2": "^2.0.0-beta.39",
|
||||
"@toast-ui/editor": "^2.5.2",
|
||||
@@ -208,7 +208,8 @@
|
||||
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
|
||||
},
|
||||
"resolutions": {
|
||||
- "chokidar": "^3.4.0"
|
||||
+ "chokidar": "^3.4.0",
|
||||
+ "@tiptap/extension-code-block": "2.0.0-beta.16"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.13.0",
|
||||
|
|
@ -9,7 +9,7 @@ Last-Update: 2021-01-26
|
|||
"time"
|
||||
+ "os/exec"
|
||||
|
||||
"github.com/dgrijalva/jwt-go"
|
||||
"github.com/golang-jwt/jwt/v4"
|
||||
"github.com/stretchr/testify/require"
|
||||
@@ -80,8 +81,11 @@
|
||||
rootDir := RootDir()
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ gitlab Gemfile
|
|||
gem 'pg', '~> 1.1'
|
||||
|
||||
gem 'rugged', '~> 1.1'
|
||||
-gem 'grape-path-helpers', '~> 1.6.3'
|
||||
+gem 'grape-path-helpers', '~> 1.6', '>= 1.6.3'
|
||||
-gem 'grape-path-helpers', '~> 1.7.0'
|
||||
+gem 'grape-path-helpers', '~> 1.7'
|
||||
|
||||
gem 'faraday', '~> 1.0'
|
||||
-gem 'marginalia', '~> 1.10.0'
|
||||
|
|
@ -45,11 +45,11 @@ gitlab Gemfile
|
|||
-gem 'doorkeeper', '~> 5.5.0.rc2'
|
||||
-gem 'doorkeeper-openid_connect', '~> 1.7.5'
|
||||
-gem 'rexml', '~> 3.2.5'
|
||||
-gem 'ruby-saml', '~> 1.12.1'
|
||||
-gem 'ruby-saml', '~> 1.13.0'
|
||||
+gem 'doorkeeper', '~> 5.5'
|
||||
+gem 'doorkeeper-openid_connect', '~> 1.7','>= 1.7.5'
|
||||
+gem 'rexml', '~> 3.2','>= 3.2.5'
|
||||
+gem 'ruby-saml', '~> 1.12','>= 1.12.1'
|
||||
+gem 'ruby-saml', '~> 1.13'
|
||||
gem 'omniauth', '~> 1.8'
|
||||
-gem 'omniauth-auth0', '~> 2.0.0'
|
||||
+gem 'omniauth-auth0', '~> 2.0'
|
||||
|
|
@ -133,9 +133,10 @@ 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 '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.1'
|
||||
+gem 'graphql-docs', '~> 1.6', group: [:development, :test]
|
||||
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
|
||||
|
|
@ -154,7 +155,7 @@ gitlab Gemfile
|
|||
+gem 'mini_magick', '~> 4.10','>= 4.10.1'
|
||||
|
||||
# for backups
|
||||
gem 'fog-aws', '~> 3.9'
|
||||
gem 'fog-aws', '~> 3.12'
|
||||
# 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'
|
||||
|
|
@ -165,7 +166,7 @@ gitlab Gemfile
|
|||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
gem 'fog-aliyun', '~> 0.3'
|
||||
-gem 'gitlab-fog-azure-rm', '~> 1.1.1', require: false
|
||||
+gem 'gitlab-fog-azure-rm', '~> 1.1','>= 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'
|
||||
|
|
@ -280,8 +281,8 @@ gitlab Gemfile
|
|||
gem 'connection_pool', '~> 2.0'
|
||||
|
||||
# Redis session store
|
||||
-gem 'redis-rails', '~> 5.0.2'
|
||||
+gem 'redis-rails', '~> 5.0', '>= 5.0.2'
|
||||
-gem 'redis-actionpack', '~> 5.2.0'
|
||||
+gem 'redis-actionpack', '~> 5.2'
|
||||
|
||||
# Discord integration
|
||||
gem 'discordrb-webhooks', '~> 3.4', require: false
|
||||
|
|
@ -376,8 +377,8 @@ gitlab Gemfile
|
|||
# Metrics
|
||||
gem 'method_source', '~> 1.0', require: false
|
||||
-gem 'webrick', '~> 1.6.1', require: false
|
||||
+gem 'webrick', '~> 1.6','>= 1.6.1', require: false
|
||||
gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
|
||||
+gem 'webrick', '~> 1.6', '>= 1.6.1', require: false
|
||||
gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client'
|
||||
|
||||
-gem 'warning', '~> 1.2.0'
|
||||
+gem 'warning', '~> 1.2'
|
||||
|
|
@ -435,8 +436,8 @@ gitlab Gemfile
|
|||
gem 'spamcheck', '~> 0.1.0'
|
||||
|
||||
# Gitaly GRPC protocol definitions
|
||||
-gem 'gitaly', '~> 14.2.0.pre.rc2'
|
||||
+gem 'gitaly', '~> 14.2'
|
||||
-gem 'gitaly', '~> 14.3.0.pre.rc1'
|
||||
+gem 'gitaly', '~> 14.3'
|
||||
|
||||
# KAS GRPC protocol definitions
|
||||
gem 'kas-grpc', '~> 0.0.2'
|
||||
|
|
@ -477,8 +478,8 @@ gitlab Gemfile
|
|||
gem 'valid_email', '~> 0.1'
|
||||
|
||||
# JSON
|
||||
-gem 'json', '~> 2.3.0'
|
||||
+gem 'json', '~> 2.3'
|
||||
-gem 'json', '~> 2.5.1'
|
||||
+gem 'json', '~> 2.5', '>= 2.5.1'
|
||||
gem 'json_schemer', '~> 0.2.18'
|
||||
-gem 'oj', '~> 3.10.6'
|
||||
-gem 'multi_json', '~> 1.14.1'
|
||||
|
|
@ -4,7 +4,7 @@ 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.10'
|
||||
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
|
||||
gem 'apollo_upload_server', '~> 2.1'
|
||||
-gem 'graphql-docs', '~> 1.6', group: [:development, :test]
|
||||
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
|
||||
|
|
@ -42,7 +42,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.2.0', require: false
|
||||
- gem 'gitlab-styles', '~> 6.3.0', require: false
|
||||
-
|
||||
- gem 'haml_lint', '~> 0.36.0', require: false
|
||||
- gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
|
|
@ -4,7 +4,7 @@ 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.10'
|
||||
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
|
||||
gem 'apollo_upload_server', '~> 2.1'
|
||||
-gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
|
||||
+gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
|
||||
|
|
@ -8,6 +8,6 @@ libruby2.7 has rexml 3.2.3.1 which has latest security fixes
|
|||
gem 'doorkeeper-openid_connect', '~> 1.7','>= 1.7.5'
|
||||
-gem 'rexml', '~> 3.2','>= 3.2.5'
|
||||
+gem 'rexml', '~> 3.2','>= 3.2.3.1'
|
||||
gem 'ruby-saml', '~> 1.12','>= 1.12.1'
|
||||
gem 'ruby-saml', '~> 1.13'
|
||||
gem 'omniauth', '~> 1.8'
|
||||
gem 'omniauth-auth0', '~> 2.0'
|
||||
33
debian/patches/series
vendored
33
debian/patches/series
vendored
|
|
@ -1,19 +1,19 @@
|
|||
0050-relax-stable-libs.patch
|
||||
0100-remove-development-test.patch
|
||||
0110-make-test-dependencies-conditional.patch
|
||||
0340-relax-httparty.patch
|
||||
0350-relax-rdoc.patch
|
||||
0430-remove-gitlab-markup.patch
|
||||
0480-embed-elasticsearch-model.patch
|
||||
0480-embed-elasticsearch-rails.patch
|
||||
0482-remove-ee-only-gems.patch
|
||||
0485-relax-gitlab-sidekiq-fetcher.patch
|
||||
0486-relax-sidekiq.patch
|
||||
0499-10-relax-capybara.patch
|
||||
0499-20-remove-capybara-screenshot.patch
|
||||
0499-30-remove-guard-rspec.patch
|
||||
0499-70-relax-graphlient.patch
|
||||
0499-92-relax-rexml.patch
|
||||
Gemfile/0010-relax-stable-libs.patch
|
||||
Gemfile/0020-remove-development-test.patch
|
||||
Gemfile/0030-make-test-dependencies-conditional.patch
|
||||
Gemfile/0040-relax-httparty.patch
|
||||
Gemfile/0050-relax-rdoc.patch
|
||||
Gemfile/0060-remove-gitlab-markup.patch
|
||||
Gemfile/0070-embed-elasticsearch-model.patch
|
||||
Gemfile/0080-embed-elasticsearch-rails.patch
|
||||
Gemfile/0090-remove-ee-only-gems.patch
|
||||
Gemfile/0100-relax-gitlab-sidekiq-fetcher.patch
|
||||
Gemfile/0110-relax-sidekiq.patch
|
||||
Gemfile/0120-relax-capybara.patch
|
||||
Gemfile/0130-remove-capybara-screenshot.patch
|
||||
Gemfile/0140-remove-guard-rspec.patch
|
||||
Gemfile/0150-relax-graphlient.patch
|
||||
Gemfile/0160-relax-rexml.patch
|
||||
0500-set-webpack-root.patch
|
||||
0510-remove-dev-dependencies.patch
|
||||
0610-source-init-functions.patch
|
||||
|
|
@ -24,7 +24,6 @@
|
|||
0710-use-yarnpkg.patch
|
||||
0740-use-packaged-modules.patch
|
||||
0750-use-matching-monaco-editor-webpack-plugin.patch
|
||||
0750-use-matching-tiptap-core.patch
|
||||
0750-fix-relative-paths.patch
|
||||
0770-remove-capybara-screenshot-rspec.patch
|
||||
0800-search-binaries-in-path.patch
|
||||
|
|
|
|||
Loading…
Reference in a new issue