realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Relax dependency on ruby-gitlab-labkit

Browse source
This commit is contained in:
Pirate Praveen 2023-05-11 19:59:34 +05:30
parent b7e1d0e50e
commit 43bec5faae
No known key found for this signature in database
GPG key ID: 8F53E0193B294B75
7 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/control vendored
View file

@ -356,7 +356,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.30.1~), ruby-gitlab-labkit (>= 0.31~),
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
ruby-thrift (>= 0.16~), ruby-thrift (>= 0.16~),

2
debian/patches/Gemfile/0140-remove-guard-rspec.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -369,7 +369,6 @@ @@ -390,7 +390,6 @@
gem 'concurrent-ruby', '~> 1.1' gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 1.0', '>= 1.0.7' gem 'test-prof', '~> 1.0', '>= 1.0.7'
gem 'rspec_junit_formatter' gem 'rspec_junit_formatter'

2
debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch vendored
View file

@ -2,7 +2,7 @@ Rakefile need this gem
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -491,5 +491,8 @@ @@ -512,5 +512,8 @@
gem 'CFPropertyList' gem 'CFPropertyList'
gem 'app_store_connect' gem 'app_store_connect'

11
debian/patches/Gemfile/0250-relax-gitlab-labkit.patch vendored Normal file
View file

@ -0,0 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -349,7 +349,7 @@
gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
-gem 'gitlab-labkit', '~> 0.30.1'
+gem 'gitlab-labkit', '~> 0.31'
gem 'thrift', '>= 0.16.0'
# I18n

2
debian/patches/nodejs/0070-use-system-katex.patch vendored
View file

@ -1,6 +1,6 @@
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -147,7 +147,7 @@ @@ -146,7 +146,7 @@
"js-cookie": "^3.0.0", "js-cookie": "^3.0.0",
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"jszip": "^3.1.3", "jszip": "^3.1.3",

2
debian/patches/nodejs/0090-lock-mermaid-version.patch vendored
View file

@ -2,7 +2,7 @@ webpack fails with mermaid 9.4.3 on bullseye, and 9.1.6 is known to work
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -153,7 +153,7 @@ @@ -152,7 +152,7 @@
"marked": "^4.0.18", "marked": "^4.0.18",
"mathjax": "3", "mathjax": "3",
"mdurl": "^1.0.1", "mdurl": "^1.0.1",

1
debian/patches/series vendored
View file

@ -14,6 +14,7 @@ Gemfile/0200-add-gitlab-dangerfiles.patch
Gemfile/0210-comment-out-openssl.patch Gemfile/0210-comment-out-openssl.patch
Gemfile/0220-relax-oj-in-ipynbdiff.patch Gemfile/0220-relax-oj-in-ipynbdiff.patch
Gemfile/0230-relax-omniauth-auth0.patch Gemfile/0230-relax-omniauth-auth0.patch
Gemfile/0250-relax-gitlab-labkit.patch
nodejs/0010-set-webpack-root.patch nodejs/0010-set-webpack-root.patch
nodejs/0020-remove-dev-dependencies.patch nodejs/0020-remove-dev-dependencies.patch
nodejs/0030-use-yarnpkg.patch nodejs/0030-use-yarnpkg.patch