diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-08 21:05:41 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-01-08 21:05:41 +0300 |
| commit | cdd51c85802a3501bd423cb7a027e079b08b6271 (patch) | |
| tree | f00cfe0143818e4e381d5d99084845c74f314bf1 /Gemfile.lock | |
| parent | ef8246749577e629fd3a758cc1331ee9856c6870 (diff) | |
| parent | c9921ab8857304f9efe0adbc1c3d3d8d6ce230ca (diff) | |
Merge branch 'update-pg' into 'master'
Update pg 0.18.4 -> 1.0
See merge request gitlab-org/gitlab-ce!17829
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4dda0bcad18..d708d0e9740 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -575,7 +575,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) @@ -1084,7 +1084,7 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - pg (~> 0.18.2) + pg (~> 1.1) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.5.1) |