Refresh patches

This commit is contained in:
Pirate Praveen 2022-04-01 22:11:57 +05:30
parent 0431e648d7
commit 178d2a97ae
5 changed files with 7 additions and 7 deletions

View file

@ -92,8 +92,8 @@ gitlab Gemfile
+gem 'invisible_captcha', '~> 1.1' +gem 'invisible_captcha', '~> 1.1'
# Two-factor authentication # Two-factor authentication
-gem 'devise-two-factor', '~> 4.0.0' -gem 'devise-two-factor', '~> 4.0.2'
+gem 'devise-two-factor', '~> 4.0' +gem 'devise-two-factor', '~> 4.0', '>= 4.0.2'
gem 'rqrcode-rails3', '~> 0.1.7' gem 'rqrcode-rails3', '~> 0.1.7'
-gem 'attr_encrypted', '~> 3.1.0' -gem 'attr_encrypted', '~> 3.1.0'
+gem 'attr_encrypted', '~> 3.1' +gem 'attr_encrypted', '~> 3.1'
@ -191,7 +191,7 @@ gitlab Gemfile
+gem 'deckar01-task_list', '~> 2.3','>= 2.3.1' +gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'
+gem 'gitlab-markup', '~> 1.8' +gem 'gitlab-markup', '~> 1.8'
+gem 'github-markup', '~> 1.7', require: 'github/markup' +gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.23.2' gem 'commonmarker', '~> 0.23.4'
-gem 'kramdown', '~> 2.3.1' -gem 'kramdown', '~> 2.3.1'
-gem 'RedCloth', '~> 4.3.2' -gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~> 6.3.2' -gem 'rdoc', '~> 6.3.2'

View file

@ -3,7 +3,7 @@ Allow rdoc from ruby 2.5 to match requirement
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
gem 'commonmarker', '~> 0.23.2' gem 'commonmarker', '~> 0.23.4'
gem 'kramdown', '~> 2.3','>= 2.3.1' gem 'kramdown', '~> 2.3','>= 2.3.1'
gem 'RedCloth', '~> 4.3','>= 4.3.2' gem 'RedCloth', '~> 4.3','>= 4.3.2'
-gem 'rdoc', '~> 6.3','>= 6.3.2' -gem 'rdoc', '~> 6.3','>= 6.3.2'

View file

@ -10,5 +10,5 @@ maintaining two almost same packages.
gem 'deckar01-task_list', '~> 2.3','>= 2.3.1' gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'
-gem 'gitlab-markup', '~> 1.8' -gem 'gitlab-markup', '~> 1.8'
gem 'github-markup', '~> 1.7', require: 'github/markup' 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' gem 'kramdown', '~> 2.3','>= 2.3.1'

View file

@ -187,7 +187,7 @@ Use debian packaged node modules when available
"raphael": "^2.2.7", "raphael": "^2.2.7",
@@ -179,27 +179,26 @@ @@ -179,27 +179,26 @@
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
"swagger-ui-dist": "^3.52.3", "swagger-ui-dist": "4.8.0",
"three": "^0.84.0", "three": "^0.84.0",
- "three-orbit-controls": "^82.1.0", - "three-orbit-controls": "^82.1.0",
+ "three-orbit-controls": "link:/usr/share/nodejs/three-orbit-controls", + "three-orbit-controls": "link:/usr/share/nodejs/three-orbit-controls",

View file

@ -2,7 +2,7 @@
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -153,7 +153,7 @@ @@ -154,7 +154,7 @@
"mermaid": "^8.13.10", "mermaid": "^8.13.10",
"minimatch": "link:/usr/share/nodejs/minimatch", "minimatch": "link:/usr/share/nodejs/minimatch",
"monaco-editor": "^0.25.2", "monaco-editor": "^0.25.2",