realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge tag 'debian/13.4.6-3' into buster-fasttrack

Browse source 
gitlab Debian release 13.4.6-3
This commit is contained in:
Sruthi Chandran 2020-12-08 01:30:26 +05:30
commit a4587e1bf4
5 changed files with 71 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
debian/changelog vendored
View file

@ -1,3 +1,21 @@
gitlab (13.4.6-3) unstable; urgency=medium
[ Pirate Praveen ]
* Use packaged version of css-loader, raw-loader, file-loader, style-loader
and copy-webpack-plugin
* Add schema-utils 3.0, mkdirp 1.0 and loader-utils 2.0 to package.json
to force yarn to move incompatible versions from gitlab's node_modules
directory to node_modules directory of other modules (Closes: #976310)
-- Sruthi Chandran <srud@debian.org> Sun, 06 Dec 2020 22:54:05 +0530
gitlab (13.4.6-2) unstable; urgency=medium
* Upload to unstable (Closes: #976294)
* Set minimum version for grpc and google-protobuf
-- Sruthi Chandran <srud@debian.org> Wed, 02 Dec 2020 23:45:40 +0530
gitlab (13.4.6-1~fto10+1) buster-fasttrack; urgency=medium
* Rebuild for buster-fasttrack.

10
debian/control vendored
View file

@ -322,8 +322,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-bcrypt-pbkdf (>= 1.0~),
# Gitaly GRPC client
ruby-gitaly (>= 13.4.6~),
ruby-grpc (>= 1.19~),
ruby-google-protobuf (>= 3.7.1~),
ruby-grpc (>= 1.30.2~),
ruby-google-protobuf (>= 3.12~),
#
ruby-toml-rb (>= 1.0.0-2~),
# Feature toggles
@ -367,6 +367,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
node-clipboard,
node-codemirror,
node-compression-webpack-plugin (>= 3.0.1~),
node-copy-webpack-plugin (>= 5.0~),
node-core-js (>= 3.2.1~),
node-css-loader (>= 2.1.1~),
# node-d3 includes d3-sankey
@ -377,7 +378,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
node-deckar01-task-list (>= 2.2.1),
node-exports-loader (>= 0.7~),
node-imports-loader (>= 0.8~),
# node-file-loader (>= 3.0.1~),
node-file-loader (>= 5.0~),
node-fuzzaldrin-plus (>= 0.5~),
node-glob (>= 7.1.6~),
node-jed,
@ -398,7 +399,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
node-prosemirror-model,
node-prosemirror-markdown,
node-raven-js,
# node-raw-loader (>= 1.0~),
node-raw-loader (>= 4.0~),
node-style-loader (>= 1.0~),
node-three-orbit-controls (>= 82.1~),
node-three-stl-loader (>= 1.0.4~),
node-timeago.js (>= 4.0~),

29
debian/patches/0740-use-packaged-modules.patch vendored
View file

@ -3,6 +3,8 @@ Use debian packaged node modules when available
- Remove webpack-bundle-analyzer
- Resolve .json files
- Add more plugins to babel.config.js
- Add schema-utils 3.0, mkdirp 1.0 and loader-utils 2.0 to ensure compatibility
for packaged modules (See #976310)
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@ -89,7 +91,7 @@ Use debian packaged node modules when available
"@gitlab/at.js": "1.5.5",
"@gitlab/svgs": "1.164.0",
"@gitlab/ui": "21.3.1",
@@ -55,29 +49,14 @@
@@ -55,29 +49,12 @@
"apollo-link": "^1.2.14",
"apollo-link-batch-http": "^1.2.14",
"apollo-upload-client": "^13.0.0",
@ -105,11 +107,11 @@ Use debian packaged node modules when available
- "codemirror": "^5.48.4",
"codesandbox-api": "0.0.23",
- "compression-webpack-plugin": "^3.0.1",
"copy-webpack-plugin": "^5.0.5",
- "copy-webpack-plugin": "^5.0.5",
- "core-js": "^3.6.4",
"cron-validator": "^1.1.1",
"cropper": "^2.3.0",
"css-loader": "^2.1.1",
- "css-loader": "^2.1.1",
- "d3": "^5.16.0",
- "d3-sankey": "^0.12.3",
- "d3-scale": "^2.2.2",
@ -119,12 +121,12 @@ Use debian packaged node modules when available
"diff": "^3.4.0",
"document-register-element": "1.14.3",
"dompurify": "^2.0.11",
@@ -85,29 +64,19 @@
@@ -85,81 +62,55 @@
"editorconfig": "^0.15.3",
"emoji-regex": "^7.0.3",
"emoji-unicode-version": "^0.2.1",
- "exports-loader": "^0.7.0",
"file-loader": "^5.1.0",
- "file-loader": "^5.1.0",
"font-awesome": "4.7.0",
"fuzzaldrin-plus": "^0.6.0",
- "glob": "^7.1.6",
@ -146,10 +148,14 @@ Use debian packaged node modules when available
- "jszip-utils": "^0.0.2",
"katex": "^0.10.0",
- "lodash": "^4.17.20",
+ "loader-utils": "^2.0.0",
"marked": "^0.3.12",
"mermaid": "^8.5.2",
"mersenne-twister": "1.1.0",
@@ -117,13 +86,8 @@
"minimatch": "^3.0.4",
"miragejs": "^0.1.40",
+ "mkdirp": "^1.0.4",
"mock-apollo-client": "^0.4.0",
"monaco-editor": "^0.20.0",
"monaco-editor-webpack-plugin": "^1.9.0",
"monaco-yaml": "^2.4.1",
@ -161,10 +167,15 @@ Use debian packaged node modules when available
- "prosemirror-markdown": "^1.3.0",
- "prosemirror-model": "^1.6.4",
"raphael": "^2.2.7",
"raw-loader": "^4.0.0",
- "raw-loader": "^4.0.0",
+ "schema-utils": "^3.0.0",
"select2": "3.5.2-browserify",
@@ -135,31 +99,20 @@
"style-loader": "^1.1.3",
"smooshpack": "^0.0.62",
"sortablejs": "^1.10.2",
"sql.js": "^0.4.0",
"stickyfilljs": "^2.1.0",
"string-hash": "1.1.3",
- "style-loader": "^1.1.3",
"swagger-ui-dist": "^3.32.4",
"three": "^0.84.0",
- "three-orbit-controls": "^82.1.0",

26
debian/patches/0780-css-loader-3.patch vendored Normal file
View file

@ -0,0 +1,26 @@
From 8eb81d27554c5b361e93d7aa2593623caac9c016 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 21 Oct 2020 10:26:53 +0000
Subject: [PATCH] Update css-loader node module 2.1.1 -> 3.2.1
---
config/webpack.config.js | 6 ++-
package.json | 2 +-
yarn.lock | 107 +++++++++++++++++++++++++++------------
3 files changed, 79 insertions(+), 36 deletions(-)
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -252,8 +252,10 @@
{
loader: 'css-loader',
options: {
- modules: 'global',
- localIdentName: '[name].[contenthash:8].[ext]',
+ modules: {
+ mode: 'global',
+ localIdentName: '[name].[contenthash:8].[ext]',
+ },
},
},
],

1
debian/patches/series vendored
View file

@ -29,3 +29,4 @@
0760-remove-simplecov-cobertura.patch
0770-remove-rubocop-rspec.patch
0770-remove-capybara-screenshot-rspec.patch
0780-css-loader-3.patch