From cd2ae7a1d9bcb731406a05c5e854a00e2d911816 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 7 Dec 2021 22:39:49 +0530 Subject: [PATCH] Refresh patches --- debian/patches/Gemfile/0010-relax-stable-libs.patch | 4 ++-- debian/patches/nodejs/0040-use-packaged-modules.patch | 2 +- .../0050-use-matching-monaco-editor-webpack-plugin.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/Gemfile/0010-relax-stable-libs.patch b/debian/patches/Gemfile/0010-relax-stable-libs.patch index 5c34175ab4..d7e25744a0 100644 --- a/debian/patches/Gemfile/0010-relax-stable-libs.patch +++ b/debian/patches/Gemfile/0010-relax-stable-libs.patch @@ -126,8 +126,8 @@ gitlab Gemfile +gem 'rack-cors', '~> 1.0','>= 1.0.6', require: 'rack/cors' # GraphQL API --gem 'graphql', '~> 1.11.8' -+gem 'graphql', '~> 1.11','>= 1.11.8' +-gem 'graphql', '~> 1.11.10' ++gem 'graphql', '~> 1.11', '>= 1.11.10' # 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 diff --git a/debian/patches/nodejs/0040-use-packaged-modules.patch b/debian/patches/nodejs/0040-use-packaged-modules.patch index 32ab7e1040..847bccdcd9 100644 --- a/debian/patches/nodejs/0040-use-packaged-modules.patch +++ b/debian/patches/nodejs/0040-use-packaged-modules.patch @@ -162,7 +162,7 @@ Use debian packaged node modules when available "lowlight": "^1.20.0", "marked": "^0.3.12", "mathjax": "3", - "mermaid": "^8.13.2", + "mermaid": "^8.13.4", - "minimatch": "^3.0.4", + "minimatch": "link:/usr/share/nodejs/minimatch", "monaco-editor": "^0.25.2", diff --git a/debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch b/debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch index 0704b2d787..4033381470 100644 --- a/debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch +++ b/debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch @@ -3,7 +3,7 @@ --- a/package.json +++ b/package.json @@ -151,7 +151,7 @@ - "mermaid": "^8.13.2", + "mermaid": "^8.13.4", "minimatch": "link:/usr/share/nodejs/minimatch", "monaco-editor": "^0.25.2", - "monaco-editor-webpack-plugin": "^4.0.0",