summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-01-08 18:05:41 +0000
committerRémy Coutable <remy@rymai.me>2019-01-08 18:05:41 +0000
commitcdd51c85802a3501bd423cb7a027e079b08b6271 (patch)
treef00cfe0143818e4e381d5d99084845c74f314bf1 /Gemfile
parentef8246749577e629fd3a758cc1331ee9856c6870 (diff)
parentc9921ab8857304f9efe0adbc1c3d3d8d6ce230ca (diff)
downloadgitlab-ce-cdd51c85802a3501bd423cb7a027e079b08b6271.tar.gz
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')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 8d5fd8bbbcb..1df4584afb7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
# Supported DBs
gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
+gem 'pg', '~> 1.1', group: :postgres
gem 'rugged', '~> 0.27'
gem 'grape-path-helpers', '~> 1.0'