summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-11-14 17:14:39 +0100
committerRobert Speicher <rspeicher@gmail.com>2018-11-15 12:06:51 +0100
commit407f00be611832a7604f1f2f0e25d6c5a6e1751a (patch)
tree04a9fc307d46a41ed64f5f990f76e82b1d721760
parentb7cedd91e5ec07461b25f3920ae6cf2b00f3d84e (diff)
downloadgitlab-ce-rs-update-pg.tar.gz
Update pg from 0.18.4 to 1.1.3rs-update-pg
Changes: https://bitbucket.org/ged/ruby-pg/src/0fd7bb2494e8cc11c71c05f8f12deafa6b41fb37/History.rdoc?at=default&fileviewer=file-view-default
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--Gemfile.rails4.lock4
3 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 7030bd9c5e8..c53fc1761fe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'default_value_for', gem_versions['default_value_for']
# Supported DBs
gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
+gem 'pg', '~> 1.1.0', group: :postgres
gem 'rugged', '~> 0.27'
gem 'grape-path-helpers', '~> 1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index f08855ed049..2ab8d528037 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -571,7 +571,7 @@ GEM
atomic (>= 1.0.0)
peek
redis
- pg (0.18.4)
+ pg (1.1.3)
po_to_json (1.0.1)
json (>= 1.6.0)
powerpack (0.1.1)
@@ -1078,7 +1078,7 @@ DEPENDENCIES
peek-pg (~> 1.3.0)
peek-rblineprof (~> 0.2.0)
peek-redis (~> 1.2.0)
- pg (~> 0.18.2)
+ pg (~> 1.1.0)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.4)
pry-byebug (~> 3.4.1)
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock
index 5bec40de909..c18f18162b8 100644
--- a/Gemfile.rails4.lock
+++ b/Gemfile.rails4.lock
@@ -567,7 +567,7 @@ GEM
atomic (>= 1.0.0)
peek
redis
- pg (0.18.4)
+ pg (1.1.3)
po_to_json (1.0.1)
json (>= 1.6.0)
powerpack (0.1.1)
@@ -1069,7 +1069,7 @@ DEPENDENCIES
peek-pg (~> 1.3.0)
peek-rblineprof (~> 0.2.0)
peek-redis (~> 1.2.0)
- pg (~> 0.18.2)
+ pg (~> 1.1.0)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.4)
pry-byebug (~> 3.4.1)