Relax dependency on ruby-pg-query

This commit is contained in:
Pirate Praveen 2021-06-12 01:10:29 +05:30
parent 3afd1d6651
commit b3da4f290b
3 changed files with 19 additions and 1 deletions

2
debian/control vendored
View file

@ -323,7 +323,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
# Sentry integration # Sentry integration
ruby-sentry-raven (>= 2.13~), ruby-sentry-raven (>= 2.13~),
# PostgreSQL query parsing # PostgreSQL query parsing
ruby-pg-query (>= 1.3~), ruby-pg-query (>= 2.0~),
# #
ruby-premailer-rails (>= 1.10.3-2~), ruby-premailer-rails (>= 1.10.3-2~),
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation

View file

@ -0,0 +1,17 @@
--- a/Gemfile
+++ b/Gemfile
@@ -297,12 +297,12 @@
gem 'sentry-raven', '~> 3.0'
# PostgreSQL query parsing
-gem 'pg_query', '~> 1.3'
+gem 'pg_query', '~> 2.0'
gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.16.2'
+gem 'gitlab-labkit', '~> 0.17.1'
# 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
gem 'thrift', '>= 0.14.0'

View file

@ -18,6 +18,7 @@
0499-90-relax-webrick.patch 0499-90-relax-webrick.patch
0499-91-relax-omniauth-azure-activedirectory-v2.patch 0499-91-relax-omniauth-azure-activedirectory-v2.patch
0499-92-relax-rexml.patch 0499-92-relax-rexml.patch
0499-93-relax-labkit.patch
0500-set-webpack-root.patch 0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch 0510-remove-dev-dependencies.patch
0610-source-init-functions.patch 0610-source-init-functions.patch