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 2020-05-24 23:50:06 +05:30
parent df79fe94f4
commit b823a15e93
15 changed files with 101 additions and 423 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,14 +3,15 @@ gitlab Gemfile
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -1,6 +1,6 @@ @@ -2,7 +2,7 @@
source 'https://rubygems.org'
-gem 'rails', '6.0.2' gem 'rails', '~> 6.0.3'
+gem 'rails', '~> 6.0.2'
gem 'bootsnap', '~> 1.4.6' -gem 'bootsnap', '~> 1.4.6'
+gem 'bootsnap', '~> 1.4', '>= 1.4.6'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
@@ -10,10 +10,10 @@ @@ -10,10 +10,10 @@
# Responders respond_to and respond_with # Responders respond_to and respond_with
gem 'responders', '~> 3.0' gem 'responders', '~> 3.0'
@ -33,9 +34,9 @@ gitlab Gemfile
# Authentication libraries # Authentication libraries
gem 'devise', '~> 4.6' gem 'devise', '~> 4.6'
-gem 'doorkeeper', '~> 5.0.2' -gem 'doorkeeper', '~> 5.0.3'
-gem 'doorkeeper-openid_connect', '~> 1.6.3' -gem 'doorkeeper-openid_connect', '~> 1.6.3'
+gem 'doorkeeper', '~> 5.0', '>= 5.0.2' +gem 'doorkeeper', '~> 5.0', '>= 5.0.3'
+gem 'doorkeeper-openid_connect', '~> 1.6', '>= 1.6.3' +gem 'doorkeeper-openid_connect', '~> 1.6', '>= 1.6.3'
gem 'omniauth', '~> 1.8' gem 'omniauth', '~> 1.8'
-gem 'omniauth-auth0', '~> 2.0.0' -gem 'omniauth-auth0', '~> 2.0.0'
@ -156,10 +157,10 @@ gitlab Gemfile
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.12' gem 'html-pipeline', '~> 2.12'
-gem 'deckar01-task_list', '2.3.1' -gem 'deckar01-task_list', '2.3.1'
-gem 'gitlab-markup', '~> 1.7.0' -gem 'gitlab-markup', '~> 1.7.1'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1' +gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1'
+gem 'gitlab-markup', '~> 1.7' +gem 'gitlab-markup', '~> 1.7', '>= 1.7.1'
+gem 'github-markup', '~> 1.7', require: 'github/markup' +gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.20' gem 'commonmarker', '~> 0.20'
-gem 'RedCloth', '~> 4.3.2' -gem 'RedCloth', '~> 4.3.2'
@ -172,18 +173,18 @@ gitlab Gemfile
-gem 'asciidoctor', '~> 2.0.10' -gem 'asciidoctor', '~> 2.0.10'
+gem 'asciidoctor', '~> 2.0', '>= 2.0.10' +gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '0.0.10' gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'rouge', '~> 3.18.0' -gem 'rouge', '~> 3.19.0'
+gem 'rouge', '~> 3.18' +gem 'rouge', '~> 3.19'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0' -gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.5' -gem 'nokogiri', '~> 1.10.9'
+gem 'bootstrap_form', '~> 4.2' +gem 'bootstrap_form', '~> 4.2'
+gem 'nokogiri', '~> 1.10', '>= 1.10.5' +gem 'nokogiri', '~> 1.10', '>= 1.10.9'
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
# Calendar rendering # Calendar rendering
@@ -163,10 +163,10 @@ @@ -163,7 +163,7 @@
gem 'diff_match_patch', '~> 0.1.0' gem 'diff_match_patch', '~> 0.1.0'
# Application server # Application server
@ -191,11 +192,7 @@ gitlab Gemfile
+gem 'rack', '~> 2.0', '>= 2.0.9' +gem 'rack', '~> 2.0', '>= 2.0.9'
group :unicorn do group :unicorn do
- gem 'unicorn', '~> 5.4.1' gem 'unicorn', '~> 5.5'
+ gem 'unicorn', '~> 5.4', '>= 5.4.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -183,13 +183,13 @@ @@ -183,13 +183,13 @@
gem 'acts-as-taggable-on', '~> 6.0' gem 'acts-as-taggable-on', '~> 6.0'
@ -221,8 +218,8 @@ gitlab Gemfile
+gem 'settingslogic', '~> 2.0', '>= 2.0.9' +gem 'settingslogic', '~> 2.0', '>= 2.0.9'
# Linear-time regex library for untrusted regular expressions # Linear-time regex library for untrusted regular expressions
-gem 're2', '~> 1.1.1' -gem 're2', '~> 1.2.0'
+gem 're2', '~> 1.1', '>= 1.1.1' +gem 're2', '~> 1.2'
# Misc # Misc
@ -246,7 +243,7 @@ gitlab Gemfile
+gem 'hipchat', '~> 1.5' +gem 'hipchat', '~> 1.5'
# Jira integration # Jira integration
gem 'jira-ruby', '~> 1.7' gem 'jira-ruby', '~> 2.0.0'
@@ -237,7 +237,7 @@ @@ -237,7 +237,7 @@
gem 'flowdock', '~> 0.7' gem 'flowdock', '~> 0.7'
@ -290,12 +287,12 @@ gitlab Gemfile
gem 'addressable', '~> 2.7' gem 'addressable', '~> 2.7'
gem 'font-awesome-rails', '~> 4.7' gem 'font-awesome-rails', '~> 4.7'
@@ -293,12 +293,12 @@ @@ -293,24 +293,24 @@
gem "gitlab-license", "~> 1.0" gem "gitlab-license", "~> 1.0"
# Protect against bruteforcing # Protect against bruteforcing
-gem 'rack-attack', '~> 6.2.0' -gem 'rack-attack', '~> 6.3.0'
+gem 'rack-attack', '~> 6.2' +gem 'rack-attack', '~> 6.3'
# Sentry integration # Sentry integration
gem 'sentry-raven', '~> 2.9' gem 'sentry-raven', '~> 2.9'
@ -304,8 +301,9 @@ gitlab Gemfile
+gem 'premailer-rails', '~> 1.10', '>= 1.10.3' +gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
gem 'gitlab-labkit', '0.12.0' -gem 'gitlab-labkit', '0.12.0'
@@ -306,11 +306,11 @@ +gem 'gitlab-labkit', '~> 0.12.0'
# I18n # I18n
gem 'ruby_parser', '~> 3.8', require: false gem 'ruby_parser', '~> 3.8', require: false
gem 'rails-i18n', '~> 6.0' gem 'rails-i18n', '~> 6.0'
@ -320,7 +318,7 @@ gitlab Gemfile
# Perf bar # Perf bar
gem 'peek', '~> 1.1' gem 'peek', '~> 1.1'
@@ -348,40 +348,40 @@ @@ -344,40 +344,40 @@
group :development, :test do group :development, :test do
gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET'] gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
@ -332,9 +330,10 @@ gitlab Gemfile
- gem 'database_cleaner', '~> 1.7.0' - gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 5.1.0' - gem 'factory_bot_rails', '~> 5.1.0'
- gem 'rspec-rails', '~> 4.0.0'
+ gem 'database_cleaner', '~> 1.7' + gem 'database_cleaner', '~> 1.7'
+ gem 'factory_bot_rails', '~> 5.1' + gem 'factory_bot_rails', '~> 5.1'
gem 'rspec-rails', '~> 4.0.0.beta4' + gem 'rspec-rails', '~> 4.0'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.11.0' - gem 'minitest', '~> 5.11.0'
@ -373,7 +372,7 @@ gitlab Gemfile
gem 'timecop', '~> 0.9.1' gem 'timecop', '~> 0.9.1'
@@ -396,19 +396,19 @@ @@ -392,19 +392,19 @@
end end
group :test do group :test do
@ -400,7 +399,7 @@ gitlab Gemfile
gem 'rails-controller-testing' gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1' gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.10.0' gem 'test-prof', '~> 0.10.0'
@@ -424,7 +424,7 @@ @@ -423,7 +423,7 @@
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
@ -409,7 +408,7 @@ gitlab Gemfile
gem 'stackprof', '~> 0.2.15', require: false gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false gem 'memory_profiler', '~> 0.9', require: false
@@ -435,11 +435,11 @@ @@ -434,11 +434,11 @@
gem 'oauth2', '~> 1.4' gem 'oauth2', '~> 1.4'
# Health check # Health check
@ -424,12 +423,12 @@ gitlab Gemfile
# NTP client # NTP client
gem 'net-ntp' gem 'net-ntp'
@@ -455,13 +455,13 @@ @@ -454,13 +454,13 @@
end end
# Gitaly GRPC protocol definitions # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 12.9.0.pre.rc4' -gem 'gitaly', '~> 13.0.0.pre.rc1'
+gem 'gitaly', '~> 12.9' +gem 'gitaly', '~> 13.0'
-gem 'grpc', '~> 1.24.0' -gem 'grpc', '~> 1.24.0'
+gem 'grpc', '~> 1.24' +gem 'grpc', '~> 1.24'
@ -442,15 +441,13 @@ gitlab Gemfile
# Feature toggles # Feature toggles
gem 'flipper', '~> 0.17.1' gem 'flipper', '~> 0.17.1'
@@ -479,14 +479,14 @@ @@ -478,12 +478,12 @@
# Countries list # Countries list
gem 'countries', '~> 3.0' gem 'countries', '~> 3.0'
-gem 'retriable', '~> 3.1.2' -gem 'retriable', '~> 3.1.2'
+gem 'retriable', '~> 3.1', '>= 3.1.2' +gem 'retriable', '~> 3.1', '>= 3.1.2'
gem 'liquid', '~> 4.0'
# LRU cache # LRU cache
gem 'lru_redux' gem 'lru_redux'
@ -459,3 +456,9 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved # Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb` # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -497,4 +497,4 @@
gem 'valid_email', '~> 0.1'
# JSON
-gem 'json', '~> 2.3.0'
+gem 'json', '~> 2.3'

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

@ -18,7 +18,7 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 1.4' gem 'batch-loader', '~> 1.4'
@@ -331,23 +329,7 @@ @@ -327,23 +325,7 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
@ -42,7 +42,7 @@ Bundler will fail when it can't find these locally
gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
@@ -366,16 +348,6 @@ @@ -362,16 +344,6 @@
gem 'spring', '~> 2.0' gem 'spring', '~> 2.0'
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4' gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
@ -59,7 +59,7 @@ Bundler will fail when it can't find these locally
gem 'benchmark-ips', '~> 2.3', require: false gem 'benchmark-ips', '~> 2.3', require: false
@@ -390,11 +362,6 @@ @@ -386,11 +358,6 @@
gem 'parallel', '~> 1.19', require: false gem 'parallel', '~> 1.19', require: false
end end

4
debian/patches/0110-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 --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -329,7 +329,7 @@ @@ -325,7 +325,7 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
@ -11,7 +11,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.9' gem 'pry-rails', '~> 0.3.9'
@@ -360,9 +360,6 @@ @@ -356,9 +356,6 @@
gem 'png_quantizator', '~> 0.2.1', require: false gem 'png_quantizator', '~> 0.2.1', require: false
gem 'parallel', '~> 1.19', require: false gem 'parallel', '~> 1.19', require: false

4
debian/patches/0350-relax-method-source.patch vendored
View file

@ -2,12 +2,12 @@ Allow newer version to satisfy requirement
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -321,7 +321,7 @@ @@ -318,7 +318,7 @@
# Metrics # Metrics
group :metrics do group :metrics do
- gem 'method_source', '~> 0.8', require: false - gem 'method_source', '~> 0.8', require: false
+ gem 'method_source', '~> 1.0', require: false + gem 'method_source', '~> 1.0', require: false
gem 'influxdb', '~> 0.2', require: false
# Prometheus # Prometheus
gem 'prometheus-client-mmap', '~> 0.10.0'

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

@ -8,7 +8,7 @@ maintaining two almost same packages.
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.12' gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1' gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1'
-gem 'gitlab-markup', '~> 1.7' -gem 'gitlab-markup', '~> 1.7', '>= 1.7.1'
gem 'github-markup', '~> 1.7', require: 'github/markup' gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.20' gem 'commonmarker', '~> 0.20'
gem 'RedCloth', '~> 4.3', '>= 4.3.2' gem 'RedCloth', '~> 4.3', '>= 4.3.2'

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

@ -13,11 +13,11 @@ This gem is used only in gitlab Enterprise Edition
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0' gem 'akismet', '~> 3.0'
@@ -282,8 +279,6 @@ @@ -282,8 +279,6 @@
gem 'request_store', '~> 1.3' gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'
-gem "gitlab-license", "~> 1.0" -gem "gitlab-license", "~> 1.0"
- -
# Protect against bruteforcing # Protect against bruteforcing
gem 'rack-attack', '~> 6.2' gem 'rack-attack', '~> 6.3'

13
debian/patches/0484-relax-asciidoctor-plantuml.patch vendored
View file

@ -1,13 +0,0 @@
Allow newer patch releases to match requirement
--- a/Gemfile
+++ b/Gemfile
@@ -143,7 +143,7 @@
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
-gem 'asciidoctor-plantuml', '0.0.10'
+gem 'asciidoctor-plantuml', '~> 0.0.10'
gem 'rouge', '~> 3.18'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2'

11
debian/patches/0485-relax-net-ssh.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -397,7 +397,7 @@
gem 'net-ntp'
# SSH host key support
-gem 'net-ssh', '~> 5.2'
+gem 'net-ssh', '~> 6.0'
gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support

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

@ -2,12 +2,12 @@ These are not required in production
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -144,65 +144,7 @@ @@ -149,64 +149,7 @@
"xterm": "^3.5.0" "xterm": "^3.5.0"
}, },
"devDependencies": { "devDependencies": {
- "@babel/plugin-transform-modules-commonjs": "^7.8.3", - "@babel/plugin-transform-modules-commonjs": "^7.8.3",
- "@gitlab/eslint-plugin": "2.2.1", - "@gitlab/eslint-plugin": "3.1.0",
- "@vue/test-utils": "^1.0.0-beta.30", - "@vue/test-utils": "^1.0.0-beta.30",
- "axios-mock-adapter": "^1.15.0", - "axios-mock-adapter": "^1.15.0",
- "babel-jest": "^24.1.0", - "babel-jest": "^24.1.0",
@ -22,11 +22,10 @@ These are not required in production
- "eslint-import-resolver-jest": "^2.1.1", - "eslint-import-resolver-jest": "^2.1.1",
- "eslint-import-resolver-webpack": "^0.12.1", - "eslint-import-resolver-webpack": "^0.12.1",
- "eslint-plugin-jasmine": "^4.1.0", - "eslint-plugin-jasmine": "^4.1.0",
- "eslint-plugin-jest": "^22.3.0",
- "eslint-plugin-no-jquery": "^2.3.0", - "eslint-plugin-no-jquery": "^2.3.0",
- "gettext-extractor": "^3.4.3", - "gettext-extractor": "^3.4.3",
- "gettext-extractor-vue": "^4.0.2", - "gettext-extractor-vue": "^4.0.2",
- "graphql-tag": "^2.10.0", - "graphql-tag": "^2.10.1",
- "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-coverage": "^3.0.0",
- "istanbul-lib-report": "^3.0.0", - "istanbul-lib-report": "^3.0.0",
- "istanbul-reports": "^3.0.0", - "istanbul-reports": "^3.0.0",
@ -65,7 +64,7 @@ These are not required in production
- "yarn-check-webpack-plugin": "^1.2.0", - "yarn-check-webpack-plugin": "^1.2.0",
- "yarn-deduplicate": "^1.1.1" - "yarn-deduplicate": "^1.1.1"
- }, - },
+ }, + },
"blockedDependencies": { "blockedDependencies": {
"bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.md#bootstrapvue" "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.md#bootstrapvue"
}, },

14
debian/patches/0610-source-init-functions.patch vendored
View file

@ -3,18 +3,18 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/12954
--- a/lib/support/init.d/gitlab --- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab
@@ -23,6 +23,9 @@ @@ -15,6 +15,9 @@
# An example defaults file can be found in lib/support/init.d/gitlab.default.example # chkconfig: - 85 14
### ### END INIT INFO
+### source init functions +### source init functions
+. /lib/init/vars.sh +. /lib/init/vars.sh
+. /lib/lsb/init-functions +. /lib/lsb/init-functions
### Environment variables ###
RAILS_ENV="production" # DO NOT EDIT THIS FILE!
@@ -39,7 +42,7 @@ @@ -48,7 +51,7 @@
web_server_pid_path="$pid_path/unicorn.pid" web_server_pid_path="$pid_path/$use_web_server.pid"
mail_room_enabled=false mail_room_enabled=false
mail_room_pid_path="$pid_path/mail_room.pid" mail_room_pid_path="$pid_path/mail_room.pid"
-gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse 2> /dev/null && pwd) -gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse 2> /dev/null && pwd)

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

@ -46,7 +46,7 @@ Use debian packaged node modules when available
loader: 'babel-loader', loader: 'babel-loader',
options: { options: {
cacheDirectory: path.join(CACHE_PATH, 'babel-loader'), cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
@@ -475,19 +478,6 @@ @@ -502,19 +505,6 @@
// enable HMR only in webpack-dev-server // enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(), DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@ -66,7 +66,7 @@ Use debian packaged node modules when available
new webpack.DefinePlugin({ new webpack.DefinePlugin({
// This one is used to define window.gon.ee and other things properly in tests: // This one is used to define window.gon.ee and other things properly in tests:
'process.env.IS_EE': JSON.stringify(IS_EE), 'process.env.IS_EE': JSON.stringify(IS_EE),
@@ -513,6 +503,7 @@ @@ -540,6 +530,7 @@
node: { node: {
fs: 'empty', // sqljs requires fs fs: 'empty', // sqljs requires fs
@ -76,7 +76,7 @@ Use debian packaged node modules when available
}; };
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -32,12 +32,6 @@ @@ -33,12 +33,6 @@
"webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js" "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
}, },
"dependencies": { "dependencies": {
@ -87,9 +87,9 @@ Use debian packaged node modules when available
- "@babel/plugin-syntax-import-meta": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3",
- "@babel/preset-env": "^7.8.4", - "@babel/preset-env": "^7.8.4",
"@gitlab/at.js": "1.5.5", "@gitlab/at.js": "1.5.5",
"@gitlab/svgs": "1.121.0", "@gitlab/svgs": "1.127.0",
"@gitlab/ui": "12.1.0", "@gitlab/ui": "14.10.0",
@@ -49,62 +43,38 @@ @@ -53,64 +47,40 @@
"apollo-link": "^1.2.11", "apollo-link": "^1.2.11",
"apollo-link-batch-http": "^1.2.11", "apollo-link-batch-http": "^1.2.11",
"apollo-upload-client": "^10.0.0", "apollo-upload-client": "^10.0.0",
@ -104,12 +104,13 @@ Use debian packaged node modules when available
- "chart.js": "2.7.2", - "chart.js": "2.7.2",
"classlist-polyfill": "^1.2.0", "classlist-polyfill": "^1.2.0",
- "clipboard": "^1.7.1", - "clipboard": "^1.7.1",
"codemirror": "^5.48.4",
"codesandbox-api": "0.0.23", "codesandbox-api": "0.0.23",
"compression-webpack-plugin": "^3.0.1", "compression-webpack-plugin": "^3.0.1",
"copy-webpack-plugin": "^5.0.5", "copy-webpack-plugin": "^5.0.5",
- "core-js": "^3.6.4", - "core-js": "^3.6.4",
"cropper": "^2.3.0", "cropper": "^2.3.0",
- "css-loader": "^1.0.0", - "css-loader": "^2.1.1",
- "d3-scale": "^2.2.2", - "d3-scale": "^2.2.2",
- "d3-selection": "^1.2.0", - "d3-selection": "^1.2.0",
- "dateformat": "^3.0.3", - "dateformat": "^3.0.3",
@ -140,6 +141,7 @@ Use debian packaged node modules when available
- "lodash": "^4.17.15", - "lodash": "^4.17.15",
"marked": "^0.3.12", "marked": "^0.3.12",
"mermaid": "^8.4.8", "mermaid": "^8.4.8",
"mitt": "^1.2.0",
"monaco-editor": "^0.18.1", "monaco-editor": "^0.18.1",
"monaco-editor-webpack-plugin": "^1.7.0", "monaco-editor-webpack-plugin": "^1.7.0",
- "mousetrap": "^1.4.6", - "mousetrap": "^1.4.6",
@ -152,7 +154,7 @@ Use debian packaged node modules when available
"raphael": "^2.2.7", "raphael": "^2.2.7",
"raw-loader": "^4.0.0", "raw-loader": "^4.0.0",
"sanitize-html": "^1.22.0", "sanitize-html": "^1.22.0",
@@ -117,18 +87,12 @@ @@ -123,17 +93,12 @@
"svg4everybody": "2.1.9", "svg4everybody": "2.1.9",
"swagger-ui-dist": "^3.24.3", "swagger-ui-dist": "^3.24.3",
"three": "^0.84.0", "three": "^0.84.0",
@ -163,15 +165,14 @@ Use debian packaged node modules when available
"tiptap-commands": "^1.4.0", "tiptap-commands": "^1.4.0",
"tiptap-extensions": "^1.8.0", "tiptap-extensions": "^1.8.0",
"tributejs": "4.1.3", "tributejs": "4.1.3",
- "underscore": "^1.9.2",
"unfetch": "^4.1.0", "unfetch": "^4.1.0",
- "url-loader": "^3.0.0", - "url-loader": "^3.0.0",
"visibilityjs": "^1.2.4", "visibilityjs": "^1.2.4",
- "vue": "^2.6.10", - "vue": "^2.6.10",
"vue-apollo": "^3.0.0-beta.28", "vue-apollo": "^3.0.3",
"vue-loader": "^15.9.0", "vue-loader": "^15.9.0",
"vue-router": "^3.0.2", "vue-router": "^3.0.2",
@@ -136,12 +100,7 @@ @@ -141,12 +106,7 @@
"vue-virtual-scroll-list": "^1.4.4", "vue-virtual-scroll-list": "^1.4.4",
"vuedraggable": "^2.23.0", "vuedraggable": "^2.23.0",
"vuex": "^3.1.0", "vuex": "^3.1.0",
@ -184,7 +185,7 @@ Use debian packaged node modules when available
+ "webpack-stats-plugin": "^0.3.1" + "webpack-stats-plugin": "^0.3.1"
}, },
"devDependencies": { "devDependencies": {
}, },
--- a/babel.config.js --- a/babel.config.js
+++ b/babel.config.js +++ b/babel.config.js
@@ -19,9 +19,12 @@ @@ -19,9 +19,12 @@

2
debian/patches/0741-add-graphql-tag.patch vendored
View file

@ -2,7 +2,7 @@ yarn fails to install graphql-tag
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -63,6 +63,7 @@ @@ -68,6 +68,7 @@
"fuzzaldrin-plus": "^0.6.0", "fuzzaldrin-plus": "^0.6.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"graphql": "^14.0.2", "graphql": "^14.0.2",

72
debian/patches/0760-update-grape.patch vendored
View file

@ -218,7 +218,7 @@ coerced to arrays of integers. Before this was done within Virtus.
babosa (1.0.2) babosa (1.0.2)
base32 (0.3.2) base32 (0.3.2)
batch-loader (1.4.0) batch-loader (1.4.0)
@@ -165,8 +161,6 @@ @@ -164,8 +160,6 @@
nap nap
open4 (~> 1.3) open4 (~> 1.3)
coderay (1.1.2) coderay (1.1.2)
@ -227,7 +227,7 @@ coerced to arrays of integers. Before this was done within Virtus.
colored2 (3.1.2) colored2 (3.1.2)
commonmarker (0.20.1) commonmarker (0.20.1)
ruby-enum (~> 0.5) ruby-enum (~> 0.5)
@@ -222,8 +216,6 @@ @@ -221,8 +215,6 @@
ruby-statistics (>= 2.1) ruby-statistics (>= 2.1)
thor (>= 0.19, < 2) thor (>= 0.19, < 2)
unicode_plot (>= 0.0.4, < 1.0.0) unicode_plot (>= 0.0.4, < 1.0.0)
@ -236,7 +236,7 @@ coerced to arrays of integers. Before this was done within Virtus.
device_detector (1.0.0) device_detector (1.0.0)
devise (4.7.1) devise (4.7.1)
bcrypt (~> 3.0) bcrypt (~> 3.0)
@@ -250,6 +242,28 @@ @@ -249,6 +241,28 @@
doorkeeper-openid_connect (1.6.3) doorkeeper-openid_connect (1.6.3)
doorkeeper (>= 5.0, < 5.2) doorkeeper (>= 5.0, < 5.2)
json-jwt (~> 1.6) json-jwt (~> 1.6)
@ -265,7 +265,7 @@ coerced to arrays of integers. Before this was done within Virtus.
ed25519 (1.2.4) ed25519 (1.2.4)
elasticsearch (6.8.0) elasticsearch (6.8.0)
elasticsearch-api (= 6.8.0) elasticsearch-api (= 6.8.0)
@@ -439,19 +453,19 @@ @@ -438,19 +452,19 @@
signet (~> 0.7) signet (~> 0.7)
gpgme (2.0.20) gpgme (2.0.20)
mini_portile2 (~> 2.3) mini_portile2 (~> 2.3)
@ -289,7 +289,7 @@ coerced to arrays of integers. Before this was done within Virtus.
rake (~> 12) rake (~> 12)
grape_logging (1.8.3) grape_logging (1.8.3)
grape grape
@@ -645,9 +659,10 @@ @@ -640,9 +654,10 @@
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.1.1) multipart-post (2.1.1)
murmurhash3 (0.1.6) murmurhash3 (0.1.6)
@ -303,7 +303,7 @@ coerced to arrays of integers. Before this was done within Virtus.
nakayoshi_fork (0.0.4) nakayoshi_fork (0.0.4)
nap (1.1.0) nap (1.1.0)
nenv (0.3.0) nenv (0.3.0)
@@ -960,6 +975,7 @@ @@ -956,6 +971,7 @@
ruby-saml (1.7.2) ruby-saml (1.7.2)
nokogiri (>= 1.5.10) nokogiri (>= 1.5.10)
ruby-statistics (2.1.2) ruby-statistics (2.1.2)
@ -311,7 +311,7 @@ coerced to arrays of integers. Before this was done within Virtus.
ruby_dep (1.5.0) ruby_dep (1.5.0)
ruby_parser (3.13.1) ruby_parser (3.13.1)
sexp_processor (~> 4.9) sexp_processor (~> 4.9)
@@ -1118,11 +1134,6 @@ @@ -1117,11 +1133,6 @@
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
version_sorter (2.2.4) version_sorter (2.2.4)
@ -323,7 +323,7 @@ coerced to arrays of integers. Before this was done within Virtus.
vmstat (2.3.0) vmstat (2.3.0)
warden (1.2.8) warden (1.2.8)
rack (>= 2.0.6) rack (>= 2.0.6)
@@ -1253,9 +1264,9 @@ @@ -1252,9 +1263,9 @@
google-api-client (~> 0.23) google-api-client (~> 0.23)
google-protobuf (~> 3.8.0) google-protobuf (~> 3.8.0)
gpgme (~> 2.0.19) gpgme (~> 2.0.19)
@ -359,25 +359,10 @@ coerced to arrays of integers. Before this was done within Virtus.
+ +
## Using HTTP status helpers ## Using HTTP status helpers
For non-200 HTTP responses, use the provided helpers in `lib/api/helpers.rb` to ensure correct behaviour (`not_found!`, `no_content!` etc.). These will `throw` inside Grape and abort the execution of your endpoint. For non-200 HTTP responses, use the provided helpers in `lib/api/helpers.rb` to ensure correct behavior (`not_found!`, `no_content!` etc.). These will `throw` inside Grape and abort the execution of your endpoint.
--- a/doc/development/ee_features.md --- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md +++ b/doc/development/ee_features.md
@@ -513,12 +513,12 @@ @@ -580,7 +580,7 @@
interface first here.
For example, suppose we have a few more optional parameters for EE. We can move the
-paramters out of the `Grape::API` class to a helper module, so we can inject it
+parameters out of the `Grape::API::Instance` class to a helper module, so we can inject it
before it would be used in the class.
```ruby
module API
- class Projects < Grape::API
+ class Projects < Grape::API::Instance
helpers Helpers::ProjectsHelpers
end
end
@@ -579,7 +579,7 @@
```ruby ```ruby
module API module API
@ -386,7 +371,7 @@ coerced to arrays of integers. Before this was done within Virtus.
# EE::API::JobArtifacts would override the following helpers # EE::API::JobArtifacts would override the following helpers
helpers do helpers do
def authorize_download_artifacts! def authorize_download_artifacts!
@@ -623,7 +623,7 @@ @@ -624,7 +624,7 @@
```ruby ```ruby
module API module API
@ -395,7 +380,7 @@ coerced to arrays of integers. Before this was done within Virtus.
helpers do helpers do
# EE::API::MergeRequests would override the following helpers # EE::API::MergeRequests would override the following helpers
def update_merge_request_ee(merge_request) def update_merge_request_ee(merge_request)
@@ -692,7 +692,7 @@ @@ -693,7 +693,7 @@
```ruby ```ruby
# api/merge_requests/parameters.rb # api/merge_requests/parameters.rb
module API module API
@ -404,7 +389,7 @@ coerced to arrays of integers. Before this was done within Virtus.
module Parameters module Parameters
def self.update_params_at_least_one_of def self.update_params_at_least_one_of
%i[ %i[
@@ -708,7 +708,7 @@ @@ -709,7 +709,7 @@
# api/merge_requests.rb # api/merge_requests.rb
module API module API
@ -448,7 +433,7 @@ coerced to arrays of integers. Before this was done within Virtus.
LOG_FILENAME = Rails.root.join("log", "api_json.log") LOG_FILENAME = Rails.root.join("log", "api_json.log")
--- a/lib/api/api_guard.rb --- a/lib/api/api_guard.rb
+++ b/lib/api/api_guard.rb +++ b/lib/api/api_guard.rb
@@ -148,7 +148,16 @@ @@ -153,7 +153,16 @@
{ scope: e.scopes }) { scope: e.scopes })
end end
@ -609,22 +594,13 @@ coerced to arrays of integers. Before this was done within Virtus.
include PaginationParams include PaginationParams
helpers do helpers do
@@ -54,7 +54,7 @@ @@ -56,7 +56,7 @@
params do params do
requires :name, type: String, desc: "New deploy token's name" requires :name, type: String, desc: "New deploy token's name"
- requires :scopes, type: Array[String], values: ::DeployToken::AVAILABLE_SCOPES.map(&:to_s), - requires :scopes, type: Array[String], values: ::DeployToken::AVAILABLE_SCOPES.map(&:to_s),
+ requires :scopes, type: Array[String], coerce_with: ::API::Validations::Types::CommaSeparatedToArray.coerce, values: ::DeployToken::AVAILABLE_SCOPES.map(&:to_s), + requires :scopes, type: Array[String], coerce_with: ::API::Validations::Types::CommaSeparatedToArray.coerce, values: ::DeployToken::AVAILABLE_SCOPES.map(&:to_s),
desc: 'Indicates the deploy token scopes. Must be at least one of "read_repository", "read_registry", or "write_registry".' desc: 'Indicates the deploy token scopes. Must be at least one of "read_repository", "read_registry", "write_registry", "read_package_registry", or "write_package_registry".'
optional :expires_at, type: DateTime, desc: 'Expiration date for the deploy token. Does not expire if no value is provided.'
optional :username, type: String, desc: 'Username for deploy token. Default is `gitlab+deploy-token-{n}`'
@@ -117,7 +117,7 @@
params do
requires :name, type: String, desc: 'The name of the deploy token'
- requires :scopes, type: Array[String], values: ::DeployToken::AVAILABLE_SCOPES.map(&:to_s),
+ requires :scopes, type: Array[String], coerce_with: ::API::Validations::Types::CommaSeparatedToArray.coerce, values: ::DeployToken::AVAILABLE_SCOPES.map(&:to_s),
desc: 'Indicates the deploy token scopes. Must be at least one of "read_repository", "read_registry", or "write_registry".'
optional :expires_at, type: DateTime, desc: 'Expiration date for the deploy token. Does not expire if no value is provided.' optional :expires_at, type: DateTime, desc: 'Expiration date for the deploy token. Does not expire if no value is provided.'
optional :username, type: String, desc: 'Username for deploy token. Default is `gitlab+deploy-token-{n}`' optional :username, type: String, desc: 'Username for deploy token. Default is `gitlab+deploy-token-{n}`'
--- a/lib/api/deployments.rb --- a/lib/api/deployments.rb
@ -822,10 +798,10 @@ coerced to arrays of integers. Before this was done within Virtus.
+ coerce_with: Validations::Types::CommaSeparatedToArray.coerce, + coerce_with: Validations::Types::CommaSeparatedToArray.coerce,
desc: 'Comma-separated list of label names' desc: 'Comma-separated list of label names'
optional :with_labels_details, type: Boolean, desc: 'Return titles of labels and other details', default: false optional :with_labels_details, type: Boolean, desc: 'Return titles of labels and other details', default: false
optional :created_after, type: DateTime, desc: 'Return merge requests created after the specified time' optional :with_merge_status_recheck, type: Boolean, desc: 'Request that stale merge statuses be rechecked asynchronously', default: false
--- a/lib/api/helpers/projects_helpers.rb --- a/lib/api/helpers/projects_helpers.rb
+++ b/lib/api/helpers/projects_helpers.rb +++ b/lib/api/helpers/projects_helpers.rb
@@ -44,7 +44,7 @@ @@ -45,7 +45,7 @@
optional :request_access_enabled, type: Boolean, desc: 'Allow users to request member access' optional :request_access_enabled, type: Boolean, desc: 'Allow users to request member access'
optional :only_allow_merge_if_pipeline_succeeds, type: Boolean, desc: 'Only allow to merge if builds succeed' optional :only_allow_merge_if_pipeline_succeeds, type: Boolean, desc: 'Only allow to merge if builds succeed'
optional :only_allow_merge_if_all_discussions_are_resolved, type: Boolean, desc: 'Only allow to merge if all discussions are resolved' optional :only_allow_merge_if_all_discussions_are_resolved, type: Boolean, desc: 'Only allow to merge if all discussions are resolved'
@ -1031,7 +1007,7 @@ coerced to arrays of integers. Before this was done within Virtus.
include PaginationParams include PaginationParams
CONTEXT_COMMITS_POST_LIMIT = 20 CONTEXT_COMMITS_POST_LIMIT = 20
@@ -177,9 +177,9 @@ @@ -182,9 +182,9 @@
params :optional_params do params :optional_params do
optional :description, type: String, desc: 'The description of the merge request' optional :description, type: String, desc: 'The description of the merge request'
optional :assignee_id, type: Integer, desc: 'The ID of a user to assign the merge request' optional :assignee_id, type: Integer, desc: 'The ID of a user to assign the merge request'
@ -1040,10 +1016,10 @@ coerced to arrays of integers. Before this was done within Virtus.
optional :milestone_id, type: Integer, desc: 'The ID of a milestone to assign the merge request' optional :milestone_id, type: Integer, desc: 'The ID of a milestone to assign the merge request'
- optional :labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names' - optional :labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names'
+ optional :labels, type: Array[String], coerce_with: Validations::Types::CommaSeparatedToArray.coerce, desc: 'Comma-separated list of label names' + optional :labels, type: Array[String], coerce_with: Validations::Types::CommaSeparatedToArray.coerce, desc: 'Comma-separated list of label names'
optional :add_labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names'
optional :remove_labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names'
optional :remove_source_branch, type: Boolean, desc: 'Remove source branch when merging' optional :remove_source_branch, type: Boolean, desc: 'Remove source branch when merging'
optional :allow_collaboration, type: Boolean, desc: 'Allow commits from members who can merge to the target branch' @@ -201,7 +201,7 @@
optional :allow_maintainer_to_push, type: Boolean, as: :allow_collaboration, desc: '[deprecated] See allow_collaboration'
@@ -194,7 +194,7 @@
end end
params do params do
use :merge_requests_params use :merge_requests_params
@ -1516,7 +1492,7 @@ coerced to arrays of integers. Before this was done within Virtus.
desc: 'Enabled sources for code import during project creation. OmniAuth must be configured for GitHub, Bitbucket, and GitLab.com' desc: 'Enabled sources for code import during project creation. OmniAuth must be configured for GitHub, Bitbucket, and GitLab.com'
optional :max_artifacts_size, type: Integer, desc: "Set the maximum file size for each job's artifacts" optional :max_artifacts_size, type: Integer, desc: "Set the maximum file size for each job's artifacts"
optional :max_attachment_size, type: Integer, desc: 'Maximum attachment size in MB' optional :max_attachment_size, type: Integer, desc: 'Maximum attachment size in MB'
@@ -121,12 +122,12 @@ @@ -112,12 +113,12 @@
requires :recaptcha_private_key, type: String, desc: 'Generate private key at http://www.google.com/recaptcha' requires :recaptcha_private_key, type: String, desc: 'Generate private key at http://www.google.com/recaptcha'
end end
optional :repository_checks_enabled, type: Boolean, desc: "GitLab will periodically run 'git fsck' in all project and wiki repositories to look for silent disk corruption issues." optional :repository_checks_enabled, type: Boolean, desc: "GitLab will periodically run 'git fsck' in all project and wiki repositories to look for silent disk corruption issues."
@ -1857,7 +1833,7 @@ coerced to arrays of integers. Before this was done within Virtus.
FooWorker.perform_async FooWorker.perform_async
--- a/.rubocop.yml --- a/.rubocop.yml
+++ b/.rubocop.yml +++ b/.rubocop.yml
@@ -274,6 +274,18 @@ @@ -292,6 +292,18 @@
- 'spec/**/*' - 'spec/**/*'
- 'ee/spec/**/*' - 'ee/spec/**/*'

274
debian/patches/0791-update-css-loader.patch vendored
View file

@ -1,274 +0,0 @@
From 057f8e6071c8697a39dc86f95f33a184d644cc11 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Tue, 12 May 2020 12:33:33 +0000
Subject: [PATCH] Update css-loader ^1.0.0 -> ^2.1.1
---
changelogs/unreleased/update-css-loader.yml | 5 +
config/webpack.config.js | 3 +-
package.json | 2 +-
yarn.lock | 138 ++++++++------------
4 files changed, 63 insertions(+), 85 deletions(-)
create mode 100644 changelogs/unreleased/update-css-loader.yml
--- /dev/null
+++ b/changelogs/unreleased/update-css-loader.yml
@@ -0,0 +1,5 @@
+---
+title: Update css-loader ^1.0.0 -> ^2.1.1
+merge_request: 31743
+author: Pirate Praveen
+type: other
--- a/yarn.lock
+++ b/yarn.lock
@@ -1891,15 +1891,6 @@
follow-redirects "1.5.10"
is-buffer "^2.0.2"
-babel-code-frame@^6.26.0:
- version "6.26.0"
- resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
- integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
- dependencies:
- chalk "^1.1.3"
- esutils "^2.0.2"
- js-tokens "^3.0.2"
-
babel-eslint@^10.0.3:
version "10.0.3"
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a"
@@ -2477,7 +2468,7 @@
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
-camelcase@^5.0.0:
+camelcase@^5.0.0, camelcase@^5.2.0:
version "5.3.1"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -2525,7 +2516,7 @@
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -3212,38 +3203,28 @@
resolved "https://registry.yarnpkg.com/css-b64-images/-/css-b64-images-0.2.5.tgz#42005d83204b2b4a5d93b6b1a5644133b5927a02"
integrity sha1-QgBdgyBLK0pdk7axpWRBM7WSegI=
-css-loader@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe"
- integrity sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==
+css-loader@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz#d8254f72e412bb2238bb44dd674ffbef497333ea"
+ integrity sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==
dependencies:
- babel-code-frame "^6.26.0"
- css-selector-tokenizer "^0.7.0"
- icss-utils "^2.1.0"
- loader-utils "^1.0.2"
- lodash "^4.17.11"
- postcss "^6.0.23"
- postcss-modules-extract-imports "^1.2.0"
- postcss-modules-local-by-default "^1.2.0"
- postcss-modules-scope "^1.1.0"
- postcss-modules-values "^1.3.0"
+ camelcase "^5.2.0"
+ icss-utils "^4.1.0"
+ loader-utils "^1.2.3"
+ normalize-path "^3.0.0"
+ postcss "^7.0.14"
+ postcss-modules-extract-imports "^2.0.0"
+ postcss-modules-local-by-default "^2.0.6"
+ postcss-modules-scope "^2.1.0"
+ postcss-modules-values "^2.0.0"
postcss-value-parser "^3.3.0"
- source-list-map "^2.0.0"
+ schema-utils "^1.0.0"
css-selector-parser@^1.3:
version "1.3.0"
resolved "https://registry.yarnpkg.com/css-selector-parser/-/css-selector-parser-1.3.0.tgz#5f1ad43e2d8eefbfdc304fcd39a521664943e3eb"
integrity sha1-XxrUPi2O77/cME/NOaUhZklD4+s=
-css-selector-tokenizer@^0.7.0:
- version "0.7.2"
- resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz#11e5e27c9a48d90284f22d45061c303d7a25ad87"
- integrity sha512-yj856NGuAymN6r8bn8/Jl46pR+OC3eEvAhfGYDUe7YPtTPAYrSSw4oAniZ9Y8T5B92hjhwTBLUen0/vKPxf6pw==
- dependencies:
- cssesc "^3.0.0"
- fastparse "^1.1.2"
- regexpu-core "^4.6.0"
-
css@^2.1.0:
version "2.2.4"
resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
@@ -4703,11 +4684,6 @@
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-fastparse@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
- integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
-
fault@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.2.tgz#c3d0fec202f172a3a4d414042ad2bb5e2a3ffbaa"
@@ -5667,12 +5643,12 @@
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
-icss-utils@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
- integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
+icss-utils@^4.1.0:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
+ integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==
dependencies:
- postcss "^6.0.1"
+ postcss "^7.0.14"
ieee754@1.1.13, ieee754@^1.1.4:
version "1.1.13"
@@ -6830,11 +6806,6 @@
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-js-tokens@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
- integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
js-yaml@^3.13.1:
version "3.13.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@ -8932,36 +8903,37 @@
resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
-postcss-modules-extract-imports@^1.2.0:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
- integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==
+postcss-modules-extract-imports@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
+ integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
dependencies:
- postcss "^6.0.1"
+ postcss "^7.0.5"
-postcss-modules-local-by-default@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
- integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
+postcss-modules-local-by-default@^2.0.6:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz#dd9953f6dd476b5fd1ef2d8830c8929760b56e63"
+ integrity sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==
dependencies:
- css-selector-tokenizer "^0.7.0"
- postcss "^6.0.1"
+ postcss "^7.0.6"
+ postcss-selector-parser "^6.0.0"
+ postcss-value-parser "^3.3.1"
-postcss-modules-scope@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
- integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
+postcss-modules-scope@^2.1.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee"
+ integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==
dependencies:
- css-selector-tokenizer "^0.7.0"
- postcss "^6.0.1"
+ postcss "^7.0.6"
+ postcss-selector-parser "^6.0.0"
-postcss-modules-values@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
- integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
+postcss-modules-values@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64"
+ integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==
dependencies:
icss-replace-symbols "^1.1.0"
- postcss "^6.0.1"
+ postcss "^7.0.6"
postcss-reporter@^6.0.1:
version "6.0.1"
@@ -9018,7 +8990,7 @@
indexes-of "^1.0.1"
uniq "^1.0.1"
-postcss-selector-parser@^6.0.2:
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
@@ -9042,15 +9014,6 @@
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz#99a983d365f7b2ad8d0f9b8c3094926eab4b936d"
integrity sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==
-postcss@^6.0.1, postcss@^6.0.23:
- version "6.0.23"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
- integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
- dependencies:
- chalk "^2.4.1"
- source-map "^0.6.1"
- supports-color "^5.4.0"
-
postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.7:
version "7.0.27"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
@@ -9060,6 +9023,15 @@
source-map "^0.6.1"
supports-color "^6.1.0"
+postcss@^7.0.5, postcss@^7.0.6:
+ version "7.0.30"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2"
+ integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==
+ dependencies:
+ chalk "^2.4.2"
+ source-map "^0.6.1"
+ supports-color "^6.1.0"
+
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -10852,7 +10824,7 @@
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.2.0, supports-color@^5.3.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -240,7 +240,8 @@
{
loader: 'css-loader',
options: {
- name: '[name].[hash:8].[ext]',
+ modules: 'global',
+ localIdentName: '[name].[contenthash:8].[ext]'
},
},
],

3
debian/patches/series vendored
View file

@ -10,8 +10,6 @@
0480-embed-elasticsearch-rails.patch 0480-embed-elasticsearch-rails.patch
0480-embed-faraday-middleware-aws-signers-v4.patch 0480-embed-faraday-middleware-aws-signers-v4.patch
0482-remove-ee-only-gems.patch 0482-remove-ee-only-gems.patch
0484-relax-asciidoctor-plantuml.patch
0485-relax-net-ssh.patch
0500-set-webpack-root.patch 0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch 0510-remove-dev-dependencies.patch
0520-add-system-lib-path-for-webpack.patch 0520-add-system-lib-path-for-webpack.patch
@ -27,4 +25,3 @@
0750-fix-relative-paths.patch 0750-fix-relative-paths.patch
0760-update-grape.patch 0760-update-grape.patch
0790-protobuf-compat.patch 0790-protobuf-compat.patch
0791-update-css-loader.patch