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-02-22 22:40:45 +05:30
parent eaabfef43f
commit 6c5a8b737f
17 changed files with 75 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
debian/patches/0050-relax-stable-libs.patch vendored
View file

@ -88,9 +88,9 @@ gitlab Gemfile
gem 'u2f', '~> 0.2.1'
# GitLab Pages
-gem 'validates_hostname', '~> 1.0.10'
-gem 'validates_hostname', '~> 1.0.11'
-gem 'rubyzip', '~> 2.0.0', require: 'zip'
+gem 'validates_hostname', '~> 1.0', '>= 1.0.10'
+gem 'validates_hostname', '~> 1.0', '>= 1.0.11'
+gem 'rubyzip', '~> 2.0', require: 'zip'
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.6'
@ -145,15 +145,15 @@ gitlab Gemfile
+gem 'mini_magick', '~> 4.10', '>= 4.10.1'
# for backups
gem 'fog-aws', '~> 3.5'
gem 'fog-aws', '~> 3.7'
# 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'
+gem 'fog-core', '= 2.1'
gem 'fog-google', '~> 1.11'
gem 'fog-google', '~> 1.12'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
@@ -133,36 +133,36 @@
@@ -133,12 +133,12 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -168,8 +168,7 @@ gitlab Gemfile
gem 'aws-sdk-core', '~> 3'
gem 'aws-sdk-cloudformation', '~> 1'
gem 'aws-sdk-s3', '~> 1'
-gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
+gem 'faraday_middleware-aws-sigv4', '~> 0.3.0'
@@ -146,24 +146,24 @@
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.12'
@ -179,7 +178,7 @@ gitlab Gemfile
+gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1'
+gem 'gitlab-markup', '~> 1.7', '>= 1.7.1'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.20'
gem 'commonmarker', '~> 0.21'
-gem 'kramdown', '~> 2.3.0'
-gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~> 6.1.2'
@ -193,8 +192,9 @@ gitlab Gemfile
+gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'rouge', '~> 3.25.0'
+gem 'rouge', '~> 3.25'
gem 'asciidoctor-kroki', '~> 0.2.2', require: false
-gem 'rouge', '~> 3.26.0'
+gem 'rouge', '~> 3.26'
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.9'
@ -203,7 +203,7 @@ gitlab Gemfile
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -173,7 +173,7 @@
@@ -174,7 +174,7 @@
gem 'diff_match_patch', '~> 0.1.0'
# Application server
@ -212,7 +212,7 @@ gitlab Gemfile
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
@@ -194,13 +194,13 @@
@@ -195,13 +195,13 @@
gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
@ -229,8 +229,8 @@ gitlab Gemfile
# HTTP requests
gem 'httparty', '~> 0.16.4'
@@ -212,14 +212,14 @@
gem 'ruby-progressbar'
@@ -213,14 +213,14 @@
gem 'ruby-progressbar', '~> 1.10'
# GitLab settings
-gem 'settingslogic', '~> 2.0.9'
@ -247,7 +247,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.4'
@@ -232,39 +232,39 @@
@@ -233,39 +233,39 @@
gem 'connection_pool', '~> 2.0'
# Redis session store
@ -295,7 +295,7 @@ gitlab Gemfile
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -287,8 +287,8 @@
@@ -288,8 +288,8 @@
gem 'rack-proxy', '~> 0.6.0'
@ -305,7 +305,7 @@ gitlab Gemfile
+gem 'terser', '~> 1.0', '>= 1.0.2'
gem 'addressable', '~> 2.7'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
@@ -300,7 +300,7 @@
gem "gitlab-license", "~> 1.0"
@ -323,8 +323,8 @@ gitlab Gemfile
+gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.13.1'
+gem 'gitlab-labkit', '~> 0.13.1'
-gem 'gitlab-labkit', '0.13.3'
+gem 'gitlab-labkit', '~> 0.13.3'
# I18n
gem 'ruby_parser', '~> 3.15', require: false
@ -339,10 +339,10 @@ gitlab Gemfile
# Perf bar
gem 'peek', '~> 1.1'
@@ -351,37 +351,37 @@
end
@@ -352,37 +352,37 @@
group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false
- gem 'bullet', '~> 6.1.0'
- gem 'pry-byebug', '~> 3.9.0', platform: :mri
+ gem 'bullet', '~> 6.1'
@ -370,8 +370,8 @@ gitlab Gemfile
+ gem 'spring', '~> 2.1'
+ gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 5.1.0', require: false
+ gem 'gitlab-styles', '~> 5.1', require: false
- gem 'gitlab-styles', '~> 5.3.0', require: false
+ gem 'gitlab-styles', '~> 5.3', require: false
gem 'scss_lint', '~> 0.59.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false
@ -388,7 +388,7 @@ gitlab Gemfile
gem 'timecop', '~> 0.9.1'
@@ -403,18 +403,18 @@
@@ -404,18 +404,18 @@
end
group :test do
@ -413,7 +413,7 @@ gitlab Gemfile
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0'
@@ -433,7 +433,7 @@
@@ -434,7 +434,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -422,7 +422,7 @@ gitlab Gemfile
gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
@@ -447,8 +447,8 @@
@@ -448,8 +448,8 @@
gem 'health_check', '~> 3.0'
# System information
@ -433,12 +433,12 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -464,13 +464,13 @@
@@ -465,13 +465,13 @@
end
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.5.0-rc2'
+gem 'gitaly', '~> 13.5'
-gem 'gitaly', '~> 13.7.0.pre.rc1'
+gem 'gitaly', '~> 13.7'
-gem 'grpc', '~> 1.30.2'
+gem 'grpc', '~> 1.30', '>= 1.30.2'
@ -450,7 +450,7 @@ gitlab Gemfile
# Feature toggles
gem 'flipper', '~> 0.17.1'
@@ -488,12 +488,12 @@
@@ -490,12 +490,12 @@
# Countries list
gem 'countries', '~> 3.0'
@ -465,7 +465,7 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -507,12 +507,12 @@
@@ -509,12 +509,12 @@
gem 'valid_email', '~> 0.1'
# JSON

8
debian/patches/0100-remove-development-test.patch vendored
View file

@ -36,13 +36,13 @@ Bundler will fail when it can't find these locally
-end
-
group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1'
gem 'pry-byebug', '~> 3.9', platform: :mri
@@ -370,12 +355,6 @@
@@ -371,12 +356,6 @@
gem 'spring', '~> 2.1'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
- gem 'gitlab-styles', '~> 5.1', require: false
- gem 'gitlab-styles', '~> 5.3', require: false
-
- gem 'scss_lint', '~> 0.59.0', require: false
- gem 'haml_lint', '~> 0.36.0', require: false
@ -51,7 +51,7 @@ Bundler will fail when it can't find these locally
gem 'benchmark-ips', '~> 2.3', require: false
gem 'knapsack', '~> 1.17'
@@ -392,16 +371,6 @@
@@ -393,16 +372,6 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
end

4
debian/patches/0110-make-test-dependencies-conditional.patch vendored
View file

@ -8,10 +8,10 @@ Make test dependencies conditional so we can enable them when running autopkgtes
-group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1'
gem 'pry-byebug', '~> 3.9', platform: :mri
gem 'pry-rails', '~> 0.3.9'
@@ -369,9 +369,7 @@
@@ -370,9 +370,7 @@
gem 'parallel', '~> 1.19', require: false
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false

2
debian/patches/0340-relax-httparty.patch vendored
View file

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

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

@ -3,7 +3,7 @@ Allow rdoc from ruby 2.5 to match requirement
--- a/Gemfile
+++ b/Gemfile
@@ -151,7 +151,7 @@
gem 'commonmarker', '~> 0.20'
gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3'
gem 'RedCloth', '~> 4.3', '>= 4.3.2'
-gem 'rdoc', '~> 6.1', '>= 6.1.2'

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

@ -10,5 +10,5 @@ maintaining two almost same packages.
gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1'
-gem 'gitlab-markup', '~> 1.7', '>= 1.7.1'
gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.20'
gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3'

2
debian/patches/0440-remove-unicorn.patch vendored
View file

@ -3,7 +3,7 @@ gitlab-puma changes is included in puma package.
--- a/Gemfile
+++ b/Gemfile
@@ -175,14 +175,9 @@
@@ -176,14 +176,9 @@
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'

2
debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch vendored
View file

@ -2,7 +2,7 @@ Allow newer version in the archive to satisfy the requirement
--- a/Gemfile
+++ b/Gemfile
@@ -187,7 +187,7 @@
@@ -188,7 +188,7 @@
gem 'sidekiq', '~> 5.2', '>= 5.2.7'
gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.7'

2
debian/patches/0486-relax-sidekiq.patch vendored
View file

@ -2,7 +2,7 @@ ruby-sidekiq 6 is in unstable
--- a/Gemfile
+++ b/Gemfile
@@ -184,7 +184,7 @@
@@ -185,7 +185,7 @@
gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs

2
debian/patches/0499-10-relax-capybara.patch vendored
View file

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

2
debian/patches/0499-20-remove-capybara-screenshot.patch vendored
View file

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

2
debian/patches/0499-30-remove-guard-rspec.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -374,7 +374,6 @@
@@ -375,7 +375,6 @@
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.12.0'
gem 'rspec_junit_formatter'

6
debian/patches/0499-40-relax-rouge.patch vendored
View file

@ -3,11 +3,11 @@ rouge update is blocked by
--- a/Gemfile
+++ b/Gemfile
@@ -154,7 +154,7 @@
gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
@@ -155,7 +155,7 @@
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'rouge', '~> 3.25'
gem 'asciidoctor-kroki', '~> 0.2.2', require: false
-gem 'rouge', '~> 3.26'
+gem 'rouge', '~> 3.21'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2'

7
debian/patches/0510-remove-dev-dependencies.patch vendored
View file

@ -2,7 +2,7 @@ These are not required in production
--- a/package.json
+++ b/package.json
@@ -161,64 +161,6 @@
@@ -160,66 +160,7 @@
"xterm": "3.14.5"
},
"devDependencies": {
@ -36,6 +36,7 @@ These are not required in production
- "jest-canvas-mock": "^2.1.2",
- "jest-environment-jsdom": "^26.5.2",
- "jest-junit": "^12.0.0",
- "jest-raw-loader": "^1.0.1",
- "jest-util": "^26.5.2",
- "jsdoc": "^3.5.5",
- "jsdoc-vue": "^1.0.0",
@ -64,6 +65,8 @@ These are not required in production
- "xhr-mock": "^2.5.1",
- "yarn-check-webpack-plugin": "^1.2.0",
- "yarn-deduplicate": "^1.1.1"
},
- },
+ },
"blockedDependencies": {
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
},

2
debian/patches/0520-add-system-lib-path-for-webpack.patch vendored
View file

@ -2,7 +2,7 @@ Debian specific patch to allow webpack to resolve packaged node modules
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -164,9 +164,14 @@
@@ -175,9 +175,14 @@
resolve: {
extensions: ['.js', '.gql', '.graphql'],

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

@ -28,16 +28,16 @@ Use debian packaged node modules when available
const CopyWebpackPlugin = require('copy-webpack-plugin');
const vendorDllHash = require('./helpers/vendor_dll_hash');
@@ -154,6 +153,8 @@
@@ -165,6 +164,8 @@
entry: generateEntries,
+ externals: [ 'canvas' ],
+
output: {
path: path.join(ROOT_PATH, 'public/assets/webpack'),
publicPath: '/assets/webpack/',
@@ -163,13 +164,13 @@
path: WEBPACK_OUTPUT_PATH,
publicPath: WEBPACK_PUBLIC_PATH,
@@ -174,13 +175,13 @@
},
resolve: {
@ -54,7 +54,7 @@ Use debian packaged node modules when available
},
module: {
@@ -182,9 +183,13 @@
@@ -193,9 +194,13 @@
},
{
test: /\.js$/,
@ -69,7 +69,7 @@ Use debian packaged node modules when available
loader: 'babel-loader',
options: {
cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
@@ -261,7 +266,7 @@
@@ -272,7 +277,7 @@
},
{
test: /\.(eot|ttf|woff|woff2)$/,
@ -78,7 +78,7 @@ Use debian packaged node modules when available
loader: 'file-loader',
options: {
name: '[name].[contenthash:8].[ext]',
@@ -528,19 +533,6 @@
@@ -551,19 +556,6 @@
// enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@ -98,7 +98,7 @@ 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:
'process.env.IS_EE': JSON.stringify(IS_EE),
@@ -572,6 +564,7 @@
@@ -598,6 +590,7 @@
node: {
fs: 'empty', // sqljs requires fs
@ -108,7 +108,7 @@ Use debian packaged node modules when available
};
--- a/package.json
+++ b/package.json
@@ -36,12 +36,12 @@
@@ -35,12 +35,12 @@
"webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
},
"dependencies": {
@ -125,8 +125,8 @@ Use debian packaged node modules when available
+ "@babel/plugin-syntax-import-meta": "link:/usr/share/nodejs/@babel/plugin-syntax-import-meta",
+ "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
"@gitlab/at.js": "1.5.5",
"@gitlab/svgs": "1.175.0",
"@gitlab/ui": "23.9.0",
"@gitlab/svgs": "1.177.0",
"@gitlab/tributejs": "1.0.0",
@@ -56,29 +56,29 @@
"apollo-link": "^1.2.14",
"apollo-link-batch-http": "^1.2.14",
@ -167,8 +167,8 @@ Use debian packaged node modules when available
+ "deckar01-task_list": "link:/usr/share/nodejs/deckar01-task_list",
"diff": "^3.4.0",
"document-register-element": "1.14.3",
"dompurify": "^2.2.2",
@@ -88,41 +88,42 @@
"dompurify": "^2.2.4",
@@ -88,41 +88,41 @@
"emoji-unicode-version": "^0.2.1",
"exports-loader": "^0.7.0",
"file-loader": "^5.1.0",
@ -182,7 +182,7 @@ Use debian packaged node modules when available
"immer": "^7.0.7",
"imports-loader": "^0.8.0",
"ipaddr.js": "^1.9.1",
"jed": "^1.1.1",
- "jed": "^1.1.1",
+ "jed": "link:/usr/share/nodejs/jed",
"jest-transform-graphql": "^2.1.0",
- "jquery": "^3.5.0",
@ -207,7 +207,7 @@ Use debian packaged node modules when available
- "minimatch": "^3.0.4",
+ "minimatch": "link:/usr/share/nodejs/minimatch",
"miragejs": "^0.1.40",
"mock-apollo-client": "^0.4.0",
"mock-apollo-client": "^0.5.0",
"monaco-editor": "^0.20.0",
"monaco-editor-webpack-plugin": "^1.9.0",
"monaco-yaml": "^2.5.1",
@ -225,7 +225,7 @@ Use debian packaged node modules when available
"raphael": "^2.2.7",
"raw-loader": "^4.0.0",
"select2": "3.5.2-browserify",
@@ -134,33 +135,90 @@
@@ -134,26 +134,25 @@
"style-loader": "^1.1.3",
"swagger-ui-dist": "^3.32.4",
"three": "^0.84.0",
@ -237,7 +237,6 @@ Use debian packaged node modules when available
"tiptap": "^1.8.0",
"tiptap-commands": "^1.4.0",
"tiptap-extensions": "^1.8.0",
"tributejs": "5.1.3",
"url-loader": "^3.0.0",
- "uuid": "8.1.0",
+ "uuid": "link:/usr/share/nodejs/uuid",
@ -245,83 +244,19 @@ Use debian packaged node modules when available
- "vue": "^2.6.12",
+ "vue": "link:/usr/share/nodejs/vue",
"vue-apollo": "^3.0.3",
"vue-loader": "^15.9.3",
"vue-router": "3.4.5",
"vue-loader": "^15.9.5",
"vue-router": "3.4.9",
- "vue-template-compiler": "^2.6.12",
+ "vue-template-compiler": "link:/usr/share/nodejs/vue-template-compiler",
"vue-virtual-scroll-list": "^1.4.4",
"vuedraggable": "^2.23.0",
"vuex": "^3.5.1",
"vuex": "^3.6.0",
"web-vitals": "^0.2.4",
"webpack": "^4.42.0",
- "webpack-bundle-analyzer": "^3.6.0",
"webpack-cli": "^3.3.11",
"webpack-stats-plugin": "^0.3.1",
"worker-loader": "^2.0.0",
"xterm": "3.14.5"
},
"devDependencies": {
+ "@babel/plugin-transform-modules-commonjs": "^7.10.1",
+ "@gitlab/eslint-plugin": "4.0.0",
+ "@testing-library/dom": "^7.16.2",
+ "@vue/test-utils": "1.0.0-beta.30",
+ "acorn": "^6.3.0",
+ "axios-mock-adapter": "^1.15.0",
+ "babel-jest": "^26.5.2",
+ "babel-plugin-dynamic-import-node": "^2.3.3",
+ "babel-plugin-istanbul": "^6.0.0",
+ "chalk": "^2.4.1",
+ "commander": "^2.18.0",
+ "custom-jquery-matchers": "^2.1.0",
+ "docdash": "^1.0.2",
+ "eslint": "^6.8.0",
+ "eslint-import-resolver-jest": "^2.1.1",
+ "eslint-import-resolver-webpack": "^0.12.1",
+ "eslint-plugin-jasmine": "^4.1.0",
+ "eslint-plugin-no-jquery": "^2.3.0",
+ "gettext-extractor": "^3.4.3",
+ "gettext-extractor-vue": "^4.0.2",
+ "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",
+ "jest-junit": "^12.0.0",
+ "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.23.2",
+ "md5": "^2.2.1",
+ "node-sass": "^4.14.1",
+ "nodemon": "^2.0.4",
+ "pixelmatch": "^4.0.2",
+ "postcss": "^7.0.14",
+ "prettier": "1.18.2",
+ "readdir-enhanced": "^2.2.4",
+ "stylelint": "^10.1.0",
+ "stylelint-config-recommended": "^2.2.0",
+ "stylelint-scss": "^3.9.2",
+ "timezone-mock": "^1.0.8",
+ "vue-jest": "4.0.0-rc.0",
+ "webpack-dev-server": "^3.10.3",
+ "xhr-mock": "^2.5.1",
+ "yarn-check-webpack-plugin": "^1.2.0",
+ "yarn-deduplicate": "^1.1.1"
},
"blockedDependencies": {
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
--- a/babel.config.js
+++ b/babel.config.js
@@ -34,9 +34,12 @@
@ -347,14 +282,3 @@ Use debian packaged node modules when available
import page from './page/index.vue';
--- a/config/application.rb
+++ b/config/application.rb
@@ -225,7 +225,7 @@
config.assets.precompile << "illustrations/*.svg"
# Import Fontawesome fonts
- config.assets.paths << "#{config.root}/node_modules/font-awesome/fonts"
+ config.assets.paths << "/usr/share/nodejs/font-awesome/fonts"
config.assets.precompile << "fontawesome-webfont.woff2"
config.assets.precompile << "fontawesome-webfont.woff"

2
debian/patches/0750-fix-relative-paths.patch vendored
View file

@ -11,7 +11,7 @@ Debian specific patch to adapt to debian policy mandated paths
+require '/usr/share/gitlab/config/smime_signature_settings'
# Default settings
Settings['ldap'] ||= Settingslogic.new({})
Settings['shared'] ||= Settingslogic.new({})
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@