Refresh patches
This commit is contained in:
parent
0431e648d7
commit
178d2a97ae
5 changed files with 7 additions and 7 deletions
|
@ -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'
|
||||
|
|
2
debian/patches/Gemfile/0050-relax-rdoc.patch
vendored
2
debian/patches/Gemfile/0050-relax-rdoc.patch
vendored
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in a new issue