Commit 8e16dfd0 authored by Stan Hu's avatar Stan Hu

Use upstream version of pg_query again

The upstream gem has incorporated all the necessary changes--namely ARM
support and SHA256 verification of libpg_query--so we can now switch
back to the official gem.

CHANGELOG: https://github.com/lfittl/pg_query/blob/master/CHANGELOG.md

Diff: https://github.com/lfittl/pg_query/compare/v1.2.0..v1.3.0
parent 3eeafcdf
...@@ -306,7 +306,7 @@ gem 'rack-attack', '~> 6.3.0' ...@@ -306,7 +306,7 @@ gem 'rack-attack', '~> 6.3.0'
gem 'sentry-raven', '~> 3.0' gem 'sentry-raven', '~> 3.0'
# PostgreSQL query parsing # PostgreSQL query parsing
gem 'gitlab-pg_query', '~> 1.3.1', require: 'pg_query' gem 'pg_query', '~> 1.3.0'
gem 'premailer-rails', '~> 1.10.3' gem 'premailer-rails', '~> 1.10.3'
......
...@@ -847,6 +847,7 @@ GEM ...@@ -847,6 +847,7 @@ GEM
peek (1.1.0) peek (1.1.0)
railties (>= 4.0.0) railties (>= 4.0.0)
pg (1.2.3) pg (1.2.3)
pg_query (1.3.0)
png_quantizator (0.2.1) png_quantizator (0.2.1)
po_to_json (1.0.1) po_to_json (1.0.1)
json (>= 1.6.0) json (>= 1.6.0)
...@@ -1361,7 +1362,6 @@ DEPENDENCIES ...@@ -1361,7 +1362,6 @@ DEPENDENCIES
gitlab-mail_room (~> 0.0.8) gitlab-mail_room (~> 0.0.8)
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
gitlab-pg_query (~> 1.3.1)
gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma (~> 4.3.3.gitlab.2)
gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
gitlab-sidekiq-fetcher (= 0.5.2) gitlab-sidekiq-fetcher (= 0.5.2)
...@@ -1451,6 +1451,7 @@ DEPENDENCIES ...@@ -1451,6 +1451,7 @@ DEPENDENCIES
parallel (~> 1.19) parallel (~> 1.19)
peek (~> 1.1) peek (~> 1.1)
pg (~> 1.1) pg (~> 1.1)
pg_query (~> 1.3.0)
png_quantizator (~> 0.2.1) png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3) premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.12.0) prometheus-client-mmap (~> 0.12.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment