From 178d2a97ae81ec7c3e7576910c460aca8b5a6802 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Fri, 1 Apr 2022 22:11:57 +0530 Subject: [PATCH] Refresh patches --- debian/patches/Gemfile/0010-relax-stable-libs.patch | 6 +++--- debian/patches/Gemfile/0050-relax-rdoc.patch | 2 +- debian/patches/Gemfile/0060-remove-gitlab-markup.patch | 2 +- debian/patches/nodejs/0040-use-packaged-modules.patch | 2 +- .../0050-use-matching-monaco-editor-webpack-plugin.patch | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/Gemfile/0010-relax-stable-libs.patch b/debian/patches/Gemfile/0010-relax-stable-libs.patch index fa3679676b..ddf0a86d03 100644 --- a/debian/patches/Gemfile/0010-relax-stable-libs.patch +++ b/debian/patches/Gemfile/0010-relax-stable-libs.patch @@ -92,8 +92,8 @@ gitlab Gemfile +gem 'invisible_captcha', '~> 1.1' # Two-factor authentication --gem 'devise-two-factor', '~> 4.0.0' -+gem 'devise-two-factor', '~> 4.0' +-gem 'devise-two-factor', '~> 4.0.2' ++gem 'devise-two-factor', '~> 4.0', '>= 4.0.2' gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 3.1.0' +gem 'attr_encrypted', '~> 3.1' @@ -191,7 +191,7 @@ gitlab Gemfile +gem 'deckar01-task_list', '~> 2.3','>= 2.3.1' +gem 'gitlab-markup', '~> 1.8' +gem 'github-markup', '~> 1.7', require: 'github/markup' - gem 'commonmarker', '~> 0.23.2' + gem 'commonmarker', '~> 0.23.4' -gem 'kramdown', '~> 2.3.1' -gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 6.3.2' diff --git a/debian/patches/Gemfile/0050-relax-rdoc.patch b/debian/patches/Gemfile/0050-relax-rdoc.patch index 5c7f4ec7bd..978f90e1e9 100644 --- a/debian/patches/Gemfile/0050-relax-rdoc.patch +++ b/debian/patches/Gemfile/0050-relax-rdoc.patch @@ -3,7 +3,7 @@ Allow rdoc from ruby 2.5 to match requirement --- a/Gemfile +++ b/Gemfile @@ -155,7 +155,7 @@ - gem 'commonmarker', '~> 0.23.2' + gem 'commonmarker', '~> 0.23.4' gem 'kramdown', '~> 2.3','>= 2.3.1' gem 'RedCloth', '~> 4.3','>= 4.3.2' -gem 'rdoc', '~> 6.3','>= 6.3.2' diff --git a/debian/patches/Gemfile/0060-remove-gitlab-markup.patch b/debian/patches/Gemfile/0060-remove-gitlab-markup.patch index 82f4cefa58..5dbdac47f7 100644 --- a/debian/patches/Gemfile/0060-remove-gitlab-markup.patch +++ b/debian/patches/Gemfile/0060-remove-gitlab-markup.patch @@ -10,5 +10,5 @@ maintaining two almost same packages. gem 'deckar01-task_list', '~> 2.3','>= 2.3.1' -gem 'gitlab-markup', '~> 1.8' gem 'github-markup', '~> 1.7', require: 'github/markup' - gem 'commonmarker', '~> 0.23.2' + gem 'commonmarker', '~> 0.23.4' gem 'kramdown', '~> 2.3','>= 2.3.1' diff --git a/debian/patches/nodejs/0040-use-packaged-modules.patch b/debian/patches/nodejs/0040-use-packaged-modules.patch index 9cc8822ca1..9d5b9ea1db 100644 --- a/debian/patches/nodejs/0040-use-packaged-modules.patch +++ b/debian/patches/nodejs/0040-use-packaged-modules.patch @@ -187,7 +187,7 @@ Use debian packaged node modules when available "raphael": "^2.2.7", @@ -179,27 +179,26 @@ "style-loader": "^2.0.0", - "swagger-ui-dist": "^3.52.3", + "swagger-ui-dist": "4.8.0", "three": "^0.84.0", - "three-orbit-controls": "^82.1.0", + "three-orbit-controls": "link:/usr/share/nodejs/three-orbit-controls", 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 aff969b927..4c0f2f9e40 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 @@ -2,7 +2,7 @@ --- a/package.json +++ b/package.json -@@ -153,7 +153,7 @@ +@@ -154,7 +154,7 @@ "mermaid": "^8.13.10", "minimatch": "link:/usr/share/nodejs/minimatch", "monaco-editor": "^0.25.2",