From dc7a5d4b4a2d2db916d2e69d0392af47d86cdd20 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 8 Apr 2020 15:34:39 +0530 Subject: [PATCH] Refresh patches --- debian/patches/0050-relax-stable-libs.patch | 54 ++++++------ .../0100-remove-development-test.patch | 8 +- ...0-make-test-dependencies-conditional.patch | 2 +- debian/patches/0440-remove-puma.patch | 2 +- .../0460-embed-derailed-benchmarks.patch | 2 +- .../0484-relax-asciidoctor-plantuml.patch | 2 +- debian/patches/0486-relax-grpc-protobuf.patch | 14 --- .../0510-remove-dev-dependencies.patch | 22 +++-- ...0520-add-system-lib-path-for-webpack.patch | 2 +- debian/patches/0620-pid-log-paths.patch | 42 ++++++--- debian/patches/0660-fix-gitlab-yml-path.patch | 2 +- debian/patches/0730-install-graphql-tag.patch | 13 --- .../patches/0740-use-packaged-modules.patch | 86 ++++++++++--------- debian/patches/0750-fix-relative-paths.patch | 2 +- debian/patches/0760-update-grape.patch | 48 +++++------ debian/patches/0790-protobuf-compat.patch | 4 +- debian/patches/series | 2 - 17 files changed, 151 insertions(+), 156 deletions(-) delete mode 100644 debian/patches/0486-relax-grpc-protobuf.patch delete mode 100644 debian/patches/0730-install-graphql-tag.patch diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch index 81eeda6459..0d41f1e371 100644 --- a/debian/patches/0050-relax-stable-libs.patch +++ b/debian/patches/0050-relax-stable-libs.patch @@ -9,7 +9,7 @@ gitlab Gemfile -gem 'rails', '6.0.2' +gem 'rails', '~> 6.0.2' - gem 'bootsnap', '~> 1.4' + gem 'bootsnap', '~> 1.4.6' @@ -10,10 +10,10 @@ # Responders respond_to and respond_with @@ -73,8 +73,8 @@ gitlab Gemfile gem 'invisible_captcha', '~> 0.12.1' # Two-factor authentication --gem 'devise-two-factor', '~> 3.0.0' -+gem 'devise-two-factor', '~> 3.0' +-gem 'devise-two-factor', '~> 3.1.0' ++gem 'devise-two-factor', '~> 3.1' gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 3.1.0' +gem 'attr_encrypted', '~> 3.1' @@ -111,8 +111,8 @@ gitlab Gemfile +gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors' # GraphQL API --gem 'graphql', '~> 1.9.12' -+gem 'graphql', '~> 1.9', '>= 1.9.12' +-gem 'graphql', '~> 1.9.19' ++gem 'graphql', '~> 1.9', '>= 1.9.19' # 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 @@ -151,7 +151,7 @@ gitlab Gemfile # Search gem 'elasticsearch-model', '~> 6.1' -@@ -138,35 +138,35 @@ +@@ -138,21 +138,21 @@ # Markdown and HTML processing gem 'html-pipeline', '~> 2.12' gem 'deckar01-task_list', '2.3.1' @@ -171,8 +171,8 @@ gitlab Gemfile +gem 'asciidoctor', '~> 2.0', '>= 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '0.0.10' --gem 'rouge', '~> 3.15.0' -+gem 'rouge', '~> 3.15' +-gem 'rouge', '~> 3.17.0' ++gem 'rouge', '~> 3.17' gem 'truncato', '~> 0.7.11' -gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.10.5' @@ -181,11 +181,7 @@ gitlab Gemfile gem 'escape_utils', '~> 1.1' # Calendar rendering - gem 'icalendar' - - # Diffs --gem 'diffy', '~> 3.1.0' -+gem 'diffy', '~> 3.1' +@@ -163,10 +163,10 @@ gem 'diff_match_patch', '~> 0.1.0' # Application server @@ -253,8 +249,8 @@ gitlab Gemfile gem 'flowdock', '~> 0.7' # Slack integration --gem 'slack-notifier', '~> 1.5.1' -+gem 'slack-notifier', '~> 1.5', '>= 1.5.1' +-gem 'slack-messenger', '~> 2.3.3' ++gem 'slack-messenger', '~> 2.3', '>= 2.3.3' # Hangouts Chat integration gem 'hangouts-chat', '~> 0.0.5' @@ -306,7 +302,7 @@ gitlab Gemfile +gem 'premailer-rails', '~> 1.10', '>= 1.10.3' # LabKit: Tracing and Correlation - gem 'gitlab-labkit', '0.9.1' + gem 'gitlab-labkit', '0.11.0' @@ -306,11 +306,11 @@ # I18n gem 'ruby_parser', '~> 3.8', require: false @@ -327,7 +323,7 @@ gitlab Gemfile group :development, :test do gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.5.1', platform: :mri -+ gem 'pry-byebug', '~> 3.5', platform: :mri ++ gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.9' gem 'awesome_print', require: false @@ -335,7 +331,7 @@ gitlab Gemfile - gem 'database_cleaner', '~> 1.7.0' + gem 'database_cleaner', '~> 1.7' gem 'factory_bot_rails', '~> 5.1.0' - gem 'rspec-rails', '~> 4.0.0.beta3' + gem 'rspec-rails', '~> 4.0.0.beta4' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' @@ -352,16 +348,17 @@ gitlab Gemfile - gem 'gitlab-styles', '~> 3.1.0', require: false + gem 'gitlab-styles', '~> 3.1', require: false # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.74.0' +- gem 'rubocop', '~> 0.74.0' - gem 'rubocop-performance', '~> 1.4.1' - gem 'rubocop-rspec', '~> 1.37.0' ++ gem 'rubocop', '~> 0.74' + gem 'rubocop-performance', '~> 1.4', '>= 1.4.1' + gem 'rubocop-rspec', '~> 1.37' gem 'scss_lint', '~> 0.56.0', require: false gem 'haml_lint', '~> 0.34.0', require: false - gem 'simplecov', '~> 0.16.1', require: false - gem 'bundler-audit', '~> 0.5.0', require: false + gem 'simplecov', '~> 0.18.5', require: false + gem 'bundler-audit', '~> 0.6.1', require: false - gem 'benchmark-ips', '~> 2.3.0', require: false + gem 'benchmark-ips', '~> 2.3', require: false @@ -371,7 +368,7 @@ gitlab Gemfile - gem 'simple_po_parser', '~> 1.1.2', require: false + gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false - gem 'timecop', '~> 0.8.0' + gem 'timecop', '~> 0.9.1' @@ -396,20 +396,20 @@ end @@ -403,7 +400,7 @@ gitlab Gemfile gem 'rails-controller-testing' gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.10.0' -@@ -424,7 +424,7 @@ +@@ -425,7 +425,7 @@ gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' @@ -412,7 +409,7 @@ gitlab Gemfile gem 'stackprof', '~> 0.2.15', require: false gem 'rbtrace', '~> 0.4', require: false gem 'memory_profiler', '~> 0.9', require: false -@@ -435,11 +435,11 @@ +@@ -436,11 +436,11 @@ gem 'oauth2', '~> 1.4' # Health check @@ -427,12 +424,9 @@ gitlab Gemfile # NTP client gem 'net-ntp' -@@ -455,13 +455,13 @@ - end - +@@ -458,11 +458,11 @@ # Gitaly GRPC protocol definitions --gem 'gitaly', '~> 1.86.0' -+gem 'gitaly', '~> 1.86' + gem 'gitaly', '~> 12.9.0.pre.rc4' -gem 'grpc', '~> 1.24.0' +gem 'grpc', '~> 1.24' @@ -445,7 +439,7 @@ gitlab Gemfile # Feature toggles gem 'flipper', '~> 0.17.1' -@@ -479,14 +479,14 @@ +@@ -480,14 +480,14 @@ # Countries list gem 'countries', '~> 3.0' diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch index 66d0736a70..10b8249a5f 100644 --- a/debian/patches/0100-remove-development-test.patch +++ b/debian/patches/0100-remove-development-test.patch @@ -39,7 +39,7 @@ Bundler will fail when it can't find these locally - group :development, :test do - gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.5', platform: :mri + gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.9' @@ -366,16 +348,7 @@ @@ -48,14 +48,14 @@ Bundler will fail when it can't find these locally - gem 'gitlab-styles', '~> 3.1', require: false - # Pin these dependencies, otherwise a new rule could break the CI pipelines -- gem 'rubocop', '~> 0.74.0' +- gem 'rubocop', '~> 0.74' - gem 'rubocop-performance', '~> 1.4', '>= 1.4.1' - gem 'rubocop-rspec', '~> 1.37' - - gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.34.0', require: false - gem 'simplecov', '~> 0.16.1', require: false -- gem 'bundler-audit', '~> 0.5.0', require: false + gem 'simplecov', '~> 0.18.5', require: false +- gem 'bundler-audit', '~> 0.6.1', require: false gem 'benchmark-ips', '~> 2.3', require: false diff --git a/debian/patches/0110-make-test-dependencies-conditional.patch b/debian/patches/0110-make-test-dependencies-conditional.patch index b2f852d3c0..c28d862dc6 100644 --- a/debian/patches/0110-make-test-dependencies-conditional.patch +++ b/debian/patches/0110-make-test-dependencies-conditional.patch @@ -6,7 +6,7 @@ -group :development, :test do +if ENV["INCLUDE_TEST_DEPENDS"] == "true" - gem 'pry-byebug', '~> 3.5', platform: :mri + gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.9' @@ -361,9 +361,6 @@ diff --git a/debian/patches/0440-remove-puma.patch b/debian/patches/0440-remove-puma.patch index 4a40a1b10d..f8071f9670 100644 --- a/debian/patches/0440-remove-puma.patch +++ b/debian/patches/0440-remove-puma.patch @@ -5,7 +5,7 @@ end -group :puma do -- gem 'gitlab-puma', '~> 4.3.1.gitlab.2', require: false +- gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false - gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false - gem 'rack-timeout', require: false -end diff --git a/debian/patches/0460-embed-derailed-benchmarks.patch b/debian/patches/0460-embed-derailed-benchmarks.patch index f4db83ca29..ff9ec8fdd3 100644 --- a/debian/patches/0460-embed-derailed-benchmarks.patch +++ b/debian/patches/0460-embed-derailed-benchmarks.patch @@ -4,7 +4,7 @@ gem 'snowplow-tracker', '~> 0.6.1' # Memory benchmarks --gem 'derailed_benchmarks', require: false +-gem 'gitlab-derailed_benchmarks', require: false +gem 'gitlab-derailed_benchmarks', require: false, path: 'vendor/gems/derailed-benchmarks' +gem 'heapy', require: false diff --git a/debian/patches/0484-relax-asciidoctor-plantuml.patch b/debian/patches/0484-relax-asciidoctor-plantuml.patch index bd8b487851..12824589d5 100644 --- a/debian/patches/0484-relax-asciidoctor-plantuml.patch +++ b/debian/patches/0484-relax-asciidoctor-plantuml.patch @@ -6,6 +6,6 @@ gem 'asciidoctor-include-ext', '~> 0.3.1', require: false -gem 'asciidoctor-plantuml', '0.0.10' +gem 'asciidoctor-plantuml', '~> 0.0.10' - gem 'rouge', '~> 3.15' + gem 'rouge', '~> 3.17' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2' diff --git a/debian/patches/0486-relax-grpc-protobuf.patch b/debian/patches/0486-relax-grpc-protobuf.patch deleted file mode 100644 index 1dfe441da5..0000000000 --- a/debian/patches/0486-relax-grpc-protobuf.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Gemfile -+++ b/Gemfile -@@ -411,9 +411,9 @@ - # Gitaly GRPC protocol definitions - gem 'gitaly', '~> 1.86' - --gem 'grpc', '~> 1.24' -+gem 'grpc', '~> 1.19' - --gem 'google-protobuf', '~> 3.8' -+gem 'google-protobuf', '~> 3.7' - - gem 'toml-rb', '~> 1.0' - diff --git a/debian/patches/0510-remove-dev-dependencies.patch b/debian/patches/0510-remove-dev-dependencies.patch index 9a69018e70..866e3f060e 100644 --- a/debian/patches/0510-remove-dev-dependencies.patch +++ b/debian/patches/0510-remove-dev-dependencies.patch @@ -1,10 +1,10 @@ --- a/package.json +++ b/package.json -@@ -145,61 +145,6 @@ +@@ -145,65 +145,7 @@ "xterm": "^3.5.0" }, "devDependencies": { -- "@babel/plugin-transform-modules-commonjs": "^7.5.0", +- "@babel/plugin-transform-modules-commonjs": "^7.8.3", - "@gitlab/eslint-config": "^3.0.0", - "@vue/test-utils": "^1.0.0-beta.30", - "axios-mock-adapter": "^1.15.0", @@ -25,6 +25,9 @@ - "gettext-extractor": "^3.4.3", - "gettext-extractor-vue": "^4.0.2", - "graphql-tag": "^2.10.0", +- "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", @@ -56,9 +59,18 @@ - "stylelint-scss": "^3.9.2", - "timezone-mock": "^1.0.8", - "vue-jest": "^4.0.0-beta.2", -- "webpack-dev-server": "^3.8.1", +- "webpack-dev-server": "^3.10.3", - "yarn-check-webpack-plugin": "^1.2.0", - "yarn-deduplicate": "^1.1.1" +- }, ++ }, + "blockedDependencies": { + "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.md#bootstrapvue" }, - "resolutions": { - "vue-jest/ts-jest": "24.0.0", +@@ -215,4 +157,4 @@ + "node": ">=10.13.0", + "yarn": "^1.10.0" + } +-} +\ No newline at end of file ++} diff --git a/debian/patches/0520-add-system-lib-path-for-webpack.patch b/debian/patches/0520-add-system-lib-path-for-webpack.patch index ee3d35bad4..73aafbf21b 100644 --- a/debian/patches/0520-add-system-lib-path-for-webpack.patch +++ b/debian/patches/0520-add-system-lib-path-for-webpack.patch @@ -1,6 +1,6 @@ --- a/config/webpack.config.js +++ b/config/webpack.config.js -@@ -153,9 +153,14 @@ +@@ -148,9 +148,14 @@ resolve: { extensions: ['.js', '.gql', '.graphql'], diff --git a/debian/patches/0620-pid-log-paths.patch b/debian/patches/0620-pid-log-paths.patch index 80ef9885d9..a008e2c7e7 100644 --- a/debian/patches/0620-pid-log-paths.patch +++ b/debian/patches/0620-pid-log-paths.patch @@ -1,19 +1,5 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13415 ---- a/bin/background_jobs -+++ b/bin/background_jobs -@@ -7,6 +7,11 @@ - sidekiq_config="$app_root/config/sidekiq_queues.yml" - gitlab_user=$(ls -l config.ru | awk '{print $3}') - -+# Read configuration variable file if it is present -+test -f /etc/default/gitlab && . /etc/default/gitlab -+ -+sidekiq_pidfile=${sidekiq_pid_path} -+ - warn() - { - echo "$@" 1>&2 --- a/bin/mail_room +++ b/bin/mail_room @@ -7,6 +7,11 @@ @@ -42,3 +28,31 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13415 get_unicorn_pid() { local pid=$(cat $unicorn_pidfile) +--- a/bin/background_jobs_sk ++++ b/bin/background_jobs_sk +@@ -7,6 +7,11 @@ + sidekiq_config="$app_root/config/sidekiq_queues.yml" + gitlab_user=$(ls -l config.ru | awk '{print $3}') + ++# Read configuration variable file if it is present ++test -f /etc/default/gitlab && . /etc/default/gitlab ++ ++sidekiq_pidfile=${sidekiq_pid_path} ++ + warn() + { + echo "$@" 1>&2 +--- a/bin/background_jobs_sk_cluster ++++ b/bin/background_jobs_sk_cluster +@@ -6,6 +6,11 @@ + sidekiq_logfile="$app_root/log/sidekiq.log" + gitlab_user=$(ls -l config.ru | awk '{print $3}') + ++# Read configuration variable file if it is present ++test -f /etc/default/gitlab && . /etc/default/gitlab ++ ++sidekiq_pidfile=${sidekiq_pid_path} ++ + warn() + { + echo "$@" 1>&2 diff --git a/debian/patches/0660-fix-gitlab-yml-path.patch b/debian/patches/0660-fix-gitlab-yml-path.patch index 59826a2564..914427ae3b 100644 --- a/debian/patches/0660-fix-gitlab-yml-path.patch +++ b/debian/patches/0660-fix-gitlab-yml-path.patch @@ -1,6 +1,6 @@ --- a/config/settings.rb +++ b/config/settings.rb -@@ -8,7 +8,7 @@ +@@ -10,7 +10,7 @@ require_dependency File.expand_path('../lib/gitlab', __dir__) class Settings < Settingslogic diff --git a/debian/patches/0730-install-graphql-tag.patch b/debian/patches/0730-install-graphql-tag.patch deleted file mode 100644 index 19dfee174d..0000000000 --- a/debian/patches/0730-install-graphql-tag.patch +++ /dev/null @@ -1,13 +0,0 @@ -Description: Install graphql-tag via yarnpkg -Author: Utkarsh Gupta - ---- a/package.json -+++ b/package.json -@@ -84,6 +84,7 @@ - "fuzzaldrin-plus": "^0.5.0", - "glob": "^7.1.2", - "graphql": "^14.0.2", -+ "graphql-tag": "^2.0.0", - "immer": "^5.2.1", - "imports-loader": "^0.8.0", - "jed": "^1.1.1", diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index 8fc6fbb485..b82881e0b2 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -8,7 +8,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin'); const vendorDllHash = require('./helpers/vendor_dll_hash'); -@@ -153,12 +152,12 @@ +@@ -148,12 +147,12 @@ resolve: { extensions: ['.js', '.gql', '.graphql'], @@ -23,16 +23,21 @@ }, module: { -@@ -171,7 +170,7 @@ +@@ -166,9 +165,12 @@ }, { test: /\.js$/, -- exclude: path => /node_modules|vendor[\\/]assets/.test(path) && !/\.vue\.js/.test(path), -+ exclude: [ path => /node_modules|vendor[\\/]assets/.test(path) && !/\.vue\.js/.test(path), /\bcore-js\b/,/\bwebpack\/buildin\b/ ], +- exclude: path => ++ exclude: [ path => + /node_modules\/(?!tributejs)|node_modules|vendor[\\/]assets/.test(path) && + !/\.vue\.js/.test(path), ++ /\bcore-js\b/, ++ /\bwebpack\/buildin\b/ ++ ], loader: 'babel-loader', options: { cacheDirectory: path.join(CACHE_PATH, 'babel-loader'), -@@ -433,19 +432,6 @@ +@@ -475,19 +477,6 @@ // enable HMR only in webpack-dev-server DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(), @@ -52,7 +57,7 @@ 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), -@@ -471,6 +457,7 @@ +@@ -513,6 +502,7 @@ node: { fs: 'empty', // sqljs requires fs @@ -62,45 +67,44 @@ }; --- a/package.json +++ b/package.json -@@ -50,65 +50,37 @@ +@@ -49,63 +49,40 @@ "apollo-link": "^1.2.11", "apollo-link-batch-http": "^1.2.11", "apollo-upload-client": "^10.0.0", -- "autosize": "^4.0.0", - "aws-sdk": "^2.526.0", +- "autosize": "^4.0.2", + "aws-sdk": "^2.637.0", - "axios": "^0.19.0", "babel-loader": "^8.0.6", "babel-plugin-lodash": "^3.3.4", -- "bootstrap": "4.3.1", - "bootstrap-vue": "2.1.0", -- "brace-expansion": "^1.1.8", + "bootstrap": "4.3.1", + "brace-expansion": "^1.1.8", "cache-loader": "^4.1.0", - "chart.js": "2.7.2", "classlist-polyfill": "^1.2.0", - "clipboard": "^1.7.1", - "codesandbox-api": "^0.0.20", + "codesandbox-api": "0.0.23", "compression-webpack-plugin": "^3.0.1", "copy-webpack-plugin": "^5.0.5", -- "core-js": "^3.2.1", +- "core-js": "^3.6.4", "cropper": "^2.3.0", - "css-loader": "^1.0.0", - "d3": "^4.13.0", +- "d3": "^4.13.0", - "d3-scale": "^1.0.7", - "d3-selection": "^1.2.0", - "dateformat": "^3.0.3", - "deckar01-task_list": "^2.3.1", "diff": "^3.4.0", - "document-register-element": "1.13.1", + "document-register-element": "1.14.3", "dropzone": "^4.2.0", "emoji-regex": "^7.0.3", "emoji-unicode-version": "^0.2.1", - "exports-loader": "^0.7.0", - "file-loader": "^4.2.0", - "formdata-polyfill": "^3.0.11", -- "fuzzaldrin-plus": "^0.5.0", -- "glob": "^7.1.2", + "file-loader": "^5.1.0", + "formdata-polyfill": "^3.0.19", + "fuzzaldrin-plus": "^0.6.0", + "glob": "^7.1.6", "graphql": "^14.0.2", - "graphql-tag": "^2.0.0", ++ "graphql-tag": "^2.0.0", "immer": "^5.2.1", - "imports-loader": "^0.8.0", - "jed": "^1.1.1", @@ -109,51 +113,53 @@ - "jquery-ujs": "1.2.2", "jquery.caret": "^0.3.1", "jquery.waitforimages": "^2.2.0", -- "js-cookie": "^2.1.3", +- "js-cookie": "^2.2.1", - "jszip": "^3.1.3", - "jszip-utils": "^0.0.2", "katex": "^0.10.0", - "lodash": "^4.17.15", -- "marked": "^0.3.12", - "mermaid": "^8.4.5", + "marked": "^0.3.12", + "mermaid": "^8.4.8", "monaco-editor": "^0.18.1", "monaco-editor-webpack-plugin": "^1.7.0", - "mousetrap": "^1.4.6", "pdfjs-dist": "^2.0.943", "pikaday": "^1.8.0", -- "popper.js": "^1.14.7", +- "popper.js": "^1.16.1", - "prismjs": "^1.6.0", "prosemirror-markdown": "^1.3.0", - "prosemirror-model": "^1.6.4", "raphael": "^2.2.7", - "raw-loader": "^3.1.0", - "sanitize-html": "^1.20.0", -@@ -121,13 +93,9 @@ + "raw-loader": "^4.0.0", + "sanitize-html": "^1.22.0", +@@ -118,16 +95,11 @@ "svg4everybody": "2.1.9", "swagger-ui-dist": "^3.24.3", "three": "^0.84.0", - "three-orbit-controls": "^82.1.0", - "three-stl-loader": "^1.0.4", -- "timeago.js": "^4.0.1", +- "timeago.js": "^4.0.2", "tiptap": "^1.8.0", "tiptap-commands": "^1.4.0", "tiptap-extensions": "^1.8.0", -- "underscore": "^1.9.0", - "url-loader": "^2.1.0", + "tributejs": "4.1.3", +- "underscore": "^1.9.2", + "unfetch": "^4.1.0", +- "url-loader": "^3.0.0", "visibilityjs": "^1.2.4", "vue": "^2.6.10", -@@ -137,13 +105,7 @@ - "vue-template-compiler": "^2.6.10", + "vue-apollo": "^3.0.0-beta.28", +@@ -137,12 +109,7 @@ "vue-virtual-scroll-list": "^1.4.4", "vuedraggable": "^2.23.0", -- "vuex": "^3.1.0", -- "webpack": "^4.41.5", -- "webpack-bundle-analyzer": "^3.5.1", -- "webpack-cli": "^3.3.9", -- "webpack-stats-plugin": "^0.3.0", + "vuex": "^3.1.0", +- "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.5.0" -+ "vuex": "^3.1.0" ++ "webpack-stats-plugin": "^0.3.1" }, "devDependencies": { - }, + }, diff --git a/debian/patches/0750-fix-relative-paths.patch b/debian/patches/0750-fix-relative-paths.patch index ccbf256861..bb63f3900b 100644 --- a/debian/patches/0750-fix-relative-paths.patch +++ b/debian/patches/0750-fix-relative-paths.patch @@ -21,7 +21,7 @@ Rails.application.initialize! --- a/config/settings.rb +++ b/config/settings.rb -@@ -5,7 +5,7 @@ +@@ -7,7 +7,7 @@ # full Rails environment being loaded. We can not use `require_relative` either, # as Rails uses `load` for `require_dependency` (used when loading the Rails # environment). This could then lead to this file being loaded twice. diff --git a/debian/patches/0760-update-grape.patch b/debian/patches/0760-update-grape.patch index 4293fcaa60..fb94b88fa8 100644 --- a/debian/patches/0760-update-grape.patch +++ b/debian/patches/0760-update-grape.patch @@ -196,7 +196,7 @@ Remove use of Virtus since this has been removed from Grape. colored2 (3.1.2) commonmarker (0.20.1) ruby-enum (~> 0.5) -@@ -248,6 +254,28 @@ +@@ -239,6 +245,28 @@ doorkeeper-openid_connect (1.6.3) doorkeeper (>= 5.0, < 5.2) json-jwt (~> 1.6) @@ -225,9 +225,9 @@ Remove use of Virtus since this has been removed from Grape. ed25519 (1.2.4) elasticsearch (6.8.0) elasticsearch-api (= 6.8.0) -@@ -435,19 +463,12 @@ +@@ -436,19 +464,12 @@ signet (~> 0.7) - gpgme (2.0.19) + gpgme (2.0.20) mini_portile2 (~> 2.3) - grape (1.1.0) - activesupport @@ -261,7 +261,7 @@ Remove use of Virtus since this has been removed from Grape. nakayoshi_fork (0.0.4) nap (1.1.0) nenv (0.3.0) -@@ -1113,11 +1135,6 @@ +@@ -1112,11 +1134,6 @@ activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.2.4) @@ -284,7 +284,7 @@ Remove use of Virtus since this has been removed from Grape. + grape-path-helpers (~> 1.3) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) - graphql (~> 1.9.12) + graphql (~> 1.9.19) --- /dev/null +++ b/changelogs/unreleased/sh-update-grape-gem.yml @@ -0,0 +1,5 @@ @@ -1058,7 +1058,7 @@ Remove use of Virtus since this has been removed from Grape. + class ProjectImport < Grape::API::Instance include PaginationParams - helpers Helpers::ProjectsHelpers + MAXIMUM_FILE_SIZE = 50.megabytes --- a/lib/api/project_milestones.rb +++ b/lib/api/project_milestones.rb @@ -1,7 +1,7 @@ @@ -1125,7 +1125,7 @@ Remove use of Virtus since this has been removed from Grape. include PaginationParams include Helpers::CustomAttributes -@@ -493,7 +493,7 @@ +@@ -504,7 +504,7 @@ desc 'Upload a file' params do # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab/issues/14960 @@ -1133,8 +1133,8 @@ Remove use of Virtus since this has been removed from Grape. + requires :file, types: [File, ::API::Validations::Types::WorkhorseFile], desc: 'The file to be uploaded' # rubocop:disable Scalability/FileUploads end post ":id/uploads" do - UploadService.new(user_project, params[:file]).execute.to_h -@@ -504,7 +504,7 @@ + upload = UploadService.new(user_project, params[:file]).execute +@@ -517,7 +517,7 @@ end params do optional :search, type: String, desc: 'Return list of users matching the search criteria' @@ -1209,7 +1209,7 @@ Remove use of Virtus since this has been removed from Grape. include PaginationParams before { authorize! :download_code, user_project } -@@ -131,7 +131,7 @@ +@@ -139,7 +139,7 @@ success Entities::Commit end params do @@ -1462,14 +1462,23 @@ Remove use of Virtus since this has been removed from Grape. detail 'Open MR Count' --- a/lib/api/users.rb +++ b/lib/api/users.rb +@@ -1,7 +1,7 @@ + # frozen_string_literal: true + + module API +- class Users < Grape::API ++ class Users < Grape::API::Instance + include PaginationParams + include APIGuard + include Helpers::CustomAttributes @@ -51,7 +51,7 @@ optional :can_create_group, type: Boolean, desc: 'Flag indicating the user can create groups' optional :external, type: Boolean, desc: 'Flag indicating the user is an external user' # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab/issues/14960 - optional :avatar, type: File, desc: 'Avatar image for user' # rubocop:disable Scalability/FileUploads + optional :avatar, types: [File, ::API::Validations::Types::WorkhorseFile], desc: 'Avatar image for user' # rubocop:disable Scalability/FileUploads - optional :theme_id, type: Integer, default: 1, desc: 'The GitLab theme for the user' - optional :color_scheme_id, type: Integer, default: 1, desc: 'The color scheme for the file viewer' + optional :theme_id, type: Integer, desc: 'The GitLab theme for the user' + optional :color_scheme_id, type: Integer, desc: 'The color scheme for the file viewer' optional :private_profile, type: Boolean, desc: 'Flag indicating the user has a private profile' --- a/lib/api/validations/types/workhorse_file.rb +++ b/lib/api/validations/types/workhorse_file.rb @@ -1515,8 +1524,8 @@ Remove use of Virtus since this has been removed from Grape. - class Version < Grape::API + class Version < Grape::API::Instance helpers ::API::Helpers::GraphqlHelpers + include APIGuard - before { authenticate! } --- a/lib/api/wikis.rb +++ b/lib/api/wikis.rb @@ -1,7 +1,7 @@ @@ -1550,7 +1559,7 @@ Remove use of Virtus since this has been removed from Grape. FooWorker.perform_async --- a/lib/api/api_guard.rb +++ b/lib/api/api_guard.rb -@@ -148,7 +148,16 @@ +@@ -144,7 +144,16 @@ { scope: e.scopes }) end @@ -1664,14 +1673,3 @@ Remove use of Virtus since this has been removed from Grape. - end - end -end ---- a/lib/api/users.rb -+++ b/lib/api/users.rb -@@ -1,7 +1,7 @@ - # frozen_string_literal: true - - module API -- class Users < Grape::API -+ class Users < Grape::API::Instance - include PaginationParams - include APIGuard - include Helpers::CustomAttributes diff --git a/debian/patches/0790-protobuf-compat.patch b/debian/patches/0790-protobuf-compat.patch index 7d57edb62a..000ca0e3dc 100644 --- a/debian/patches/0790-protobuf-compat.patch +++ b/debian/patches/0790-protobuf-compat.patch @@ -15,6 +15,6 @@ Subject: [PATCH 2/2] Fix protobuf compatibility (Thanks to Stan Hu) { - repository: repository.gitaly_repository, + repository: repository.gitaly_repository.to_h, - address: Gitlab::GitalyClient.address(project.repository_storage), - token: Gitlab::GitalyClient.token(project.repository_storage), + address: Gitlab::GitalyClient.address(container.repository_storage), + token: Gitlab::GitalyClient.token(container.repository_storage), features: Feature::Gitaly.server_feature_flags diff --git a/debian/patches/series b/debian/patches/series index 6e4098eed0..636600e0b6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,7 +12,6 @@ 0480-embed-faraday-middleware-aws-signers-v4.patch 0482-remove-ee-only-gems.patch 0484-relax-asciidoctor-plantuml.patch -0486-relax-grpc-protobuf.patch 0500-set-webpack-root.patch 0510-remove-dev-dependencies.patch 0520-add-system-lib-path-for-webpack.patch @@ -23,7 +22,6 @@ 0690-debian-usage-ping.patch 0700-add-salsa-link-to-help.patch 0710-use-yarnpkg.patch -0730-install-graphql-tag.patch 0740-use-packaged-modules.patch 0750-fix-relative-paths.patch 0760-update-grape.patch