Relax dependencies to use rugged 0.28 (1.x breaks gitlab)

This commit is contained in:
Pirate Praveen 2021-01-10 13:59:19 +05:30
parent 0730289d8c
commit c5181aeb77
4 changed files with 13 additions and 33 deletions

22
debian/control vendored
View file

@ -48,12 +48,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-default-value-for (>= 3.3~), ruby-default-value-for (>= 3.3~),
#ruby-mysql2 | ruby-pg, #ruby-mysql2 | ruby-pg,
ruby-pg (>= 1.1~), ruby-pg (>= 1.1~),
ruby-rugged (>= 1.1~), ruby-rugged (>= 0.28~),
ruby-grape-path-helpers (>= 1.3~), ruby-grape-path-helpers (>= 1.4~),
ruby-faraday (>= 1.0~), ruby-faraday (>= 1.0~),
ruby-marginalia (>= 1.9~), ruby-marginalia (>= 1.9~),
# Authentication libraries # Authentication libraries
ruby-devise (>= 4.7.1~), ruby-devise (>= 4.7.2~),
ruby-doorkeeper (>= 5.3~), ruby-doorkeeper (>= 5.3~),
ruby-doorkeeper-openid-connect (>= 1.7.4~), ruby-doorkeeper-openid-connect (>= 1.7.4~),
ruby-omniauth (>= 1.8~), ruby-omniauth (>= 1.8~),
@ -215,7 +215,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-flowdock (>= 0.7~), ruby-flowdock (>= 0.7~),
ruby-posix-spawn (>= 0.3.13~), ruby-posix-spawn (>= 0.3.13~),
# Slack integration # Slack integration
ruby-slack-messenger (>= 2.3.3~), ruby-slack-messenger (>= 2.3.4~),
# Hangouts Chat integration # Hangouts Chat integration
ruby-hangouts-chat (>= 0.0.5), ruby-hangouts-chat (>= 0.0.5),
# Asana integration # Asana integration
@ -223,7 +223,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
# FogBugz integration # FogBugz integration
ruby-fogbugz (>= 0.2.1-3~), ruby-fogbugz (>= 0.2.1-3~),
# Kubernetes integration # Kubernetes integration
ruby-kubeclient (>= 4.6~), ruby-kubeclient (>= 4.9.1~),
ruby-recursive-open-struct (>= 1.1.1~), ruby-recursive-open-struct (>= 1.1.1~),
ruby-http (>= 4.4~), ruby-http (>= 4.4~),
# Sanitize user input # Sanitize user input
@ -232,7 +232,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
# Sanitizes SVG input # Sanitizes SVG input
ruby-loofah (>= 2.2~), ruby-loofah (>= 2.2~),
# Working with license # Working with license
ruby-licensee (>= 9.14~), ruby-licensee (>= 8.9~),
# Protect against bruteforcing # Protect against bruteforcing
ruby-rack-attack (>= 6.3~), ruby-rack-attack (>= 6.3~),
# Ace editor # Ace editor
@ -270,7 +270,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
# #
ruby-premailer-rails (>= 1.10.3-2~), ruby-premailer-rails (>= 1.10.3-2~),
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
ruby-gitlab-labkit (>= 0.12.1~), ruby-gitlab-labkit (>= 0.12.2~),
# I18n # I18n
ruby-ruby-parser (>= 3.8.2~), ruby-ruby-parser (>= 3.8.2~),
ruby-rails-i18n (>= 6.0~), ruby-rails-i18n (>= 6.0~),
@ -392,11 +392,13 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
node-jszip, node-jszip,
node-jszip-utils (>= 0.0.2+dfsg-2~), node-jszip-utils (>= 0.0.2+dfsg-2~),
node-katex, node-katex,
node-lodash (>= 4.17.20+dfsg+~cs8.31.172~), # lodash/fp build is incomplete, see #979531
# node-lodash (>= 4.17.20+dfsg+~cs8.31.172~),
node-marked (>= 0.3~), node-marked (>= 0.3~),
node-mermaid, node-mermaid,
node-minimatch, node-minimatch,
node-miragejs, # backporting this will take some time
# node-miragejs,
node-mousetrap, node-mousetrap,
node-pdfjs-dist, node-pdfjs-dist,
# Include node-pikaday only after @gitlab/ui is accepted # Include node-pikaday only after @gitlab/ui is accepted
@ -409,7 +411,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
node-raw-loader (>= 4.0~), node-raw-loader (>= 4.0~),
node-style-loader (>= 1.0~), node-style-loader (>= 1.0~),
node-three-orbit-controls (>= 82.1.0-3~), node-three-orbit-controls (>= 82.1.0-3~),
node-three-stl-loader (>= 1.0.4~), node-three-stl-loader (>= 1.0.6-3~),
node-timeago.js (>= 4.0~), node-timeago.js (>= 4.0~),
node-underscore (>= 1.9~), node-underscore (>= 1.9~),
node-url-loader (>= 3.0~), node-url-loader (>= 3.0~),

View file

@ -1,20 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@
# Supported DBs
gem 'pg', '~> 1.1'
-gem 'rugged', '~> 0.28'
+gem 'rugged', '~> 1.1'
gem 'grape-path-helpers', '~> 1.4'
gem 'faraday', '~> 1.0'
@@ -259,7 +259,7 @@
gem 'loofah', '~> 2.2'
# Working with license
-gem 'licensee', '~> 8.9'
+gem 'licensee', '~> 9.14'
# Ace editor
gem 'ace-rails-ap', '~> 4.1'

View file

@ -195,9 +195,8 @@ Use debian packaged node modules when available
+ "mermaid": "link:/usr/share/nodejs/mermaid", + "mermaid": "link:/usr/share/nodejs/mermaid",
"mersenne-twister": "1.1.0", "mersenne-twister": "1.1.0",
- "minimatch": "^3.0.4", - "minimatch": "^3.0.4",
- "miragejs": "^0.1.40",
+ "minimatch": "link:/usr/share/nodejs/minimatch", + "minimatch": "link:/usr/share/nodejs/minimatch",
+ "miragejs": "link:/usr/share/nodejs/miragejs", "miragejs": "^0.1.40",
"mock-apollo-client": "^0.4.0", "mock-apollo-client": "^0.4.0",
"monaco-editor": "^0.20.0", "monaco-editor": "^0.20.0",
"monaco-editor-webpack-plugin": "^1.9.0", "monaco-editor-webpack-plugin": "^1.9.0",

View file

@ -16,7 +16,6 @@
0499-30-remove-guard-rspec.patch 0499-30-remove-guard-rspec.patch
0499-40-relax-rouge.patch 0499-40-relax-rouge.patch
0499-50-relax-rack.patch 0499-50-relax-rack.patch
0499-60-relax-rugged.patch
0500-set-webpack-root.patch 0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch 0510-remove-dev-dependencies.patch
0520-add-system-lib-path-for-webpack.patch 0520-add-system-lib-path-for-webpack.patch