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-12-11 22:56:32 +05:30
parent 83500c16ee
commit a662de8f89
17 changed files with 86 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,15 +3,15 @@ gitlab Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -2,58 +2,58 @@
@@ -2,59 +2,59 @@
source 'https://rubygems.org'
-gem 'rails', '~> 6.1.4.1'
+gem 'rails', '~> 6.1.4', '>= 6.1.4.1'
-gem 'bootsnap', '~> 1.4.6'
+gem 'bootsnap', '~> 1.4', '>= 1.4.6'
-gem 'bootsnap', '~> 1.9.1', require: false
+gem 'bootsnap', '~> 1.9', '>= 1.9.1', require: false
# Responders respond_to and respond_with
gem 'responders', '~> 3.0'
@ -26,7 +26,7 @@ gitlab Gemfile
# Supported DBs
gem 'pg', '~> 1.1'
gem 'rugged', '~> 1.1'
gem 'rugged', '~> 1.2'
-gem 'grape-path-helpers', '~> 1.7.0'
+gem 'grape-path-helpers', '~> 1.7'
@ -35,8 +35,8 @@ gitlab Gemfile
+gem 'marginalia', '~> 1.10'
# Authorization
-gem 'declarative_policy', '~> 1.0.0'
+gem 'declarative_policy', '~> 1.0'
-gem 'declarative_policy', '~> 1.1.0'
+gem 'declarative_policy', '~> 1.1'
# Authentication libraries
-gem 'devise', '~> 4.7.2'
@ -56,8 +56,9 @@ gitlab Gemfile
gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
-gem 'omniauth-cas3', '~> 1.1.4'
-gem 'omniauth-facebook', '~> 4.0.0'
+gem 'omniauth-cas3', '~> 1.1','>= 1.1.4'
gem 'omniauth-dingtalk-oauth2', '~> 1.0'
-gem 'omniauth-facebook', '~> 4.0.0'
+gem 'omniauth-facebook', '~> 4.0'
gem 'omniauth-github', '~> 1.4'
-gem 'omniauth-gitlab', '~> 1.0.2'
@ -83,7 +84,7 @@ gitlab Gemfile
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
@@ -61,17 +61,17 @@
@@ -62,17 +62,17 @@
# Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0'
@ -106,7 +107,7 @@ gitlab Gemfile
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.6'
@@ -82,7 +82,7 @@
@@ -83,7 +83,7 @@
gem 'ohai', '~> 16.10'
# GPG
@ -115,7 +116,7 @@ gitlab Gemfile
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
@@ -91,17 +91,17 @@
@@ -92,17 +92,17 @@
gem 'net-ldap', '~> 0.16.3'
# API
@ -138,7 +139,7 @@ gitlab Gemfile
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
@@ -113,23 +113,23 @@
@@ -114,23 +114,23 @@
gem 'kaminari', '~> 1.0'
# HAML
@ -161,12 +162,12 @@ gitlab Gemfile
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3'
-gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: false
+gem 'gitlab-fog-azure-rm', '~> 1.2', require: false
-gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm'
+gem 'gitlab-fog-azure-rm', '~> 1.2', require: 'fog/azurerm'
# for Google storage
gem 'google-api-client', '~> 0.33'
@@ -138,37 +138,37 @@
@@ -139,37 +139,37 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -218,7 +219,7 @@ gitlab Gemfile
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -179,12 +179,12 @@
@@ -180,12 +180,12 @@
gem 'diff_match_patch', '~> 0.1.0'
# Application server
@ -231,9 +232,9 @@ gitlab Gemfile
- gem 'puma', '~> 5.3.1', require: false
+ gem 'puma', '~> 5.3','>= 5.3.1', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false
gem 'sd_notify', '~> 0.1.0', require: false
end
@@ -195,13 +195,13 @@
@@ -197,13 +197,13 @@
gem 'acts-as-taggable-on', '~> 7.0'
# Background jobs
@ -250,7 +251,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
@ -268,7 +269,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
@ -297,7 +298,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
@ -319,7 +320,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7'
@@ -285,20 +285,20 @@
@@ -287,20 +287,20 @@
gem 'rack-proxy', '~> 0.6.0'
@ -331,7 +332,7 @@ gitlab Gemfile
+gem 'terser', '~> 1.0','>= 1.0.2'
gem 'addressable', '~> 2.8'
gem 'gemojione', '~> 3.3'
gem 'tanuki_emoji', '~> 0.5'
-gem 'gon', '~> 6.4.0'
+gem 'gon', '~> 6.4'
gem 'request_store', '~> 1.5'
@ -345,7 +346,7 @@ gitlab Gemfile
# Sentry integration
gem 'sentry-raven', '~> 3.1'
@@ -307,7 +307,7 @@
@@ -309,7 +309,7 @@
#
gem 'pg_query', '~> 2.1'
@ -354,7 +355,7 @@ gitlab Gemfile
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.21.1'
@@ -318,11 +318,11 @@
@@ -320,11 +320,11 @@
# I18n
gem 'ruby_parser', '~> 3.15', require: false
gem 'rails-i18n', '~> 6.0'
@ -368,7 +369,7 @@ gitlab Gemfile
# Perf bar
gem 'peek', '~> 1.1'
@@ -332,10 +332,10 @@
@@ -334,10 +334,10 @@
# Metrics
gem 'method_source', '~> 1.0', require: false
@ -381,7 +382,7 @@ gitlab Gemfile
group :development do
gem 'lefthook', '~> 0.7.0', require: false
@@ -410,18 +410,18 @@
@@ -414,18 +414,18 @@
end
group :test do
@ -408,7 +409,7 @@ gitlab Gemfile
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 1.0.7'
@@ -440,7 +440,7 @@
@@ -444,7 +444,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -417,7 +418,7 @@ gitlab Gemfile
gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
@@ -454,8 +454,8 @@
@@ -458,8 +458,8 @@
gem 'health_check', '~> 3.0'
# System information
@ -428,12 +429,12 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -474,14 +474,14 @@
@@ -478,14 +478,14 @@
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 14.3.0.pre.rc2'
+gem 'gitaly', '~> 14.3'
-gem 'gitaly', '~> 14.4.0.pre.rc43'
+gem 'gitaly', '~> 14.4'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
@ -446,7 +447,7 @@ gitlab Gemfile
gem 'toml-rb', '~> 2.0'
@@ -489,7 +489,7 @@
@@ -493,7 +493,7 @@
gem 'flipper', '~> 0.21.0'
gem 'flipper-active_record', '~> 0.21.0'
gem 'flipper-active_support_cache_store', '~> 0.21.0'
@ -455,7 +456,7 @@ gitlab Gemfile
gem 'gitlab-experiment', '~> 0.6.4'
# Structured logging
@@ -502,12 +502,12 @@
@@ -506,12 +506,12 @@
# Countries list
gem 'countries', '~> 3.0'
@ -470,7 +471,7 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -522,11 +522,11 @@
@@ -526,11 +526,11 @@
gem 'valid_email', '~> 0.1'
# JSON

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

@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
--- a/Gemfile
+++ b/Gemfile
@@ -102,7 +102,6 @@
@@ -103,7 +103,6 @@
# https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
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 @@
@@ -322,7 +321,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,19 +335,6 @@
@@ -339,21 +337,6 @@
gem 'warning', '~> 1.2'
@ -26,36 +26,36 @@ Bundler will fail when it can't find these locally
- gem 'lefthook', '~> 0.7.0', require: false
- gem 'solargraph', '~> 0.43', require: false
-
- gem 'letter_opener_web', '~> 1.4.1'
- gem 'letter_opener_web', '~> 2.0.0'
-
- # Better errors handler
- gem 'better_errors', '~> 2.9.0'
-
- # thin instead webrick
- gem 'thin', '~> 1.8.0'
-
- gem 'sprite-factory', '~> 1.7'
-end
-
group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1.3'
@@ -372,11 +357,6 @@
@@ -376,9 +359,6 @@
gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'gitlab-styles', '~> 6.3.0', require: false
- gem 'gitlab-styles', '~> 6.4.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
gem 'bundler-audit', '~> 0.7.0.1', require: false
gem 'knapsack', '~> 1.21.1'
@@ -395,20 +375,6 @@
gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -399,20 +379,6 @@
gem 'test_file_finder', '~> 0.1.3'
end
-group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 2.3.0', require: false
- gem 'gitlab-dangerfiles', '~> 2.5.0', require: false
-end
-
-group :development, :test, :coverage do

4
debian/patches/Gemfile/0030-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
@@ -335,7 +335,7 @@
@@ -337,7 +337,7 @@
gem 'warning', '~> 1.2'
@ -11,7 +11,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1.3'
gem 'pry-byebug'
@@ -373,9 +373,7 @@
@@ -377,9 +377,7 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
gem 'test_file_finder', '~> 0.1.3'

2
debian/patches/Gemfile/0040-relax-httparty.patch vendored
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

2
debian/patches/Gemfile/0050-relax-rdoc.patch vendored
View file

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

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

@ -4,7 +4,7 @@ maintaining two almost same packages.
--- a/Gemfile
+++ b/Gemfile
@@ -151,7 +151,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'

2
debian/patches/Gemfile/0070-embed-elasticsearch-model.patch vendored
View file

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

2
debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch vendored
View file

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

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

@ -2,7 +2,7 @@ This gem is used only in gitlab Enterprise Edition
--- a/Gemfile
+++ b/Gemfile
@@ -55,9 +55,6 @@
@@ -56,9 +56,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'

2
debian/patches/Gemfile/0120-relax-capybara.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -373,7 +373,7 @@
@@ -377,7 +377,7 @@
gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false

2
debian/patches/Gemfile/0130-remove-capybara-screenshot.patch vendored
View file

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

2
debian/patches/Gemfile/0140-remove-guard-rspec.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -383,7 +383,6 @@
@@ -387,7 +387,6 @@
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 1.0.7'
gem 'rspec_junit_formatter'

2
debian/patches/Gemfile/0150-relax-graphlient.patch vendored
View file

@ -2,7 +2,7 @@ newer version is in the archive
--- a/Gemfile
+++ b/Gemfile
@@ -99,7 +99,7 @@
@@ -100,7 +100,7 @@
# https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
gem 'apollo_upload_server', '~> 2.1'

4
debian/patches/nodejs/0010-set-webpack-root.patch vendored
View file

@ -2,9 +2,9 @@ Debian specific patch to help webpack find sources
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -25,7 +25,7 @@
@@ -26,7 +26,7 @@
const MonacoWebpackPlugin = require('./plugins/monaco_webpack');
const GraphqlKnownOperationsPlugin = require('./plugins/graphql_known_operations_plugin');
-const ROOT_PATH = path.resolve(__dirname, '..');
+const ROOT_PATH = '/usr/share/gitlab';

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

@ -2,13 +2,14 @@ These are not required in production
--- a/package.json
+++ b/package.json
@@ -204,61 +204,7 @@
"xterm": "3.14.5"
@@ -204,61 +204,6 @@
"yaml": "^2.0.0-8"
},
"devDependencies": {
- "@babel/plugin-transform-modules-commonjs": "^7.10.1",
- "@gitlab/eslint-plugin": "9.4.0",
- "@gitlab/stylelint-config": "2.3.0",
- "@gitlab/eslint-plugin": "10.0.0",
- "@gitlab/stylelint-config": "2.6.0",
- "@graphql-eslint/eslint-plugin": "2.3.0",
- "@testing-library/dom": "^7.16.2",
- "@vue/test-utils": "1.2.0",
- "acorn": "^6.3.0",
@ -23,8 +24,8 @@ These are not required in production
- "docdash": "^1.0.2",
- "eslint": "7.32.0",
- "eslint-import-resolver-jest": "3.0.2",
- "eslint-import-resolver-webpack": "0.13.1",
- "eslint-plugin-no-jquery": "2.6.0",
- "eslint-import-resolver-webpack": "0.13.2",
- "eslint-plugin-no-jquery": "2.7.0",
- "gettext-extractor": "^3.5.3",
- "gettext-extractor-vue": "^5.0.0",
- "glob": "^7.1.6",
@ -49,7 +50,7 @@ These are not required in production
- "prettier": "2.2.1",
- "prosemirror-schema-basic": "^1.1.2",
- "prosemirror-schema-list": "^1.1.6",
- "prosemirror-test-builder": "^1.0.4",
- "prosemirror-test-builder": "^1.0.5",
- "purgecss": "^4.0.3",
- "purgecss-from-html": "^4.0.3",
- "readdir-enhanced": "^2.2.4",
@ -60,8 +61,6 @@ These are not required in production
- "xhr-mock": "^2.5.1",
- "yarn-check-webpack-plugin": "^1.2.0",
- "yarn-deduplicate": "^3.1.0"
- },
+ },
},
"blockedDependencies": {
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
},

27
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 WEBPACK_VERSION = require('webpack/package.json').version;
@@ -223,6 +222,8 @@
@@ -225,6 +224,8 @@
entry: generateEntries,
@ -36,7 +36,7 @@ Use debian packaged node modules when available
output: {
path: WEBPACK_OUTPUT_PATH,
publicPath: WEBPACK_PUBLIC_PATH,
@@ -232,10 +233,15 @@
@@ -234,10 +235,15 @@
},
resolve: {
@ -53,7 +53,7 @@ Use debian packaged node modules when available
module: {
strictExportPresence: true,
rules: [
@@ -246,9 +252,13 @@
@@ -248,9 +254,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'),
@@ -335,7 +345,7 @@
@@ -337,7 +347,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]',
@@ -643,19 +653,6 @@
@@ -647,19 +657,6 @@
// enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@ -97,7 +97,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),
@@ -694,6 +691,7 @@
@@ -698,6 +695,7 @@
node: {
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",
"@gitlab/at.js": "1.5.7",
"@gitlab/favicon-overlay": "2.0.0",
"@gitlab/svgs": "1.218.0",
"@gitlab/svgs": "1.220.0",
"@gitlab/tributejs": "1.0.0",
"@gitlab/ui": "32.19.1",
"@gitlab/ui": "32.36.0",
"@gitlab/visual-review-tools": "1.6.1",
- "@rails/actioncable": "6.1.4-1",
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
@ -136,14 +136,14 @@ Use debian packaged node modules when available
"@sourcegraph/code-host-integration": "0.0.60",
@@ -106,7 +106,7 @@
"aws-sdk": "^2.637.0",
"axios": "^0.20.0",
"axios": "^0.24.0",
"babel-loader": "^8.2.2",
- "babel-plugin-lodash": "^3.3.4",
+ "babel-plugin-lodash": "link:/usr/share/nodejs/babel-plugin-lodash",
"bootstrap": "4.5.3",
"cache-loader": "^4.1.0",
"clipboard": "^1.7.1",
@@ -139,31 +139,31 @@
"canvas-confetti": "^1.4.0",
@@ -139,30 +139,30 @@
"jed": "^1.1.1",
"jquery": "^3.6.0",
"jquery.caret": "^0.3.1",
@ -177,7 +177,6 @@ Use debian packaged node modules when available
+ "popper.js": "link:/usr/share/nodejs/popper.js",
"portal-vue": "^2.1.7",
"prismjs": "^1.21.0",
"prosemirror-inputrules": "^1.1.3",
- "prosemirror-markdown": "^1.6.0",
- "prosemirror-model": "^1.14.3",
- "prosemirror-state": "^1.3.4",
@ -185,9 +184,9 @@ 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.20.2",
"prosemirror-view": "^1.20.3",
"raphael": "^2.2.7",
@@ -177,27 +177,26 @@
@@ -176,27 +176,26 @@
"style-loader": "^2.0.0",
"swagger-ui-dist": "^3.52.3",
"three": "^0.84.0",

4
debian/patches/tweaks/0070-remove-capybara-screenshot-rspec.patch vendored
View file

@ -8,14 +8,14 @@
require 'selenium-webdriver'
# Give CI some extra time
@@ -110,18 +109,6 @@
@@ -112,18 +111,6 @@
Capybara.default_normalize_ws = true
Capybara.enable_aria_label = true
-Capybara::Screenshot.append_timestamp = false
-
-Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
- example.full_description.downcase.parameterize(separator: "_")[0..99]
- example.full_description.downcase.parameterize(separator: "_")[0..SCREENSHOT_FILENAME_LENGTH]
-end
-# Keep only the screenshots generated from the last failing test suite
-Capybara::Screenshot.prune_strategy = :keep_last_run