summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-01-14 04:47:24 +0000
committerGo MAEDA <maeda@farend.jp>2019-01-14 04:47:24 +0000
commit4f26018dd349d23a262237fe63b182ff8222c047 (patch)
treec18c0131e05210252200a2537debdda5ba35414f /Gemfile
parentcaf31d58c2c4a98402c1b0c1e9383078e61ac63e (diff)
downloadredmine-4f26018dd349d23a262237fe63b182ff8222c047.tar.gz
redmine-4f26018dd349d23a262237fe63b182ff8222c047.zip
Merged r17795 from trunk to 4.0-stable (#30420).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17796 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 05d916fa0..1c2916ece 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,7 +56,7 @@ if File.exist?(database_file)
when 'mysql2'
gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
when /postgresql/
- gem "pg", "~> 1.0.0", :platforms => [:mri, :mingw, :x64_mingw]
+ gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw]
when /sqlite3/
gem "sqlite3", "~>1.3.12", :platforms => [:mri, :mingw, :x64_mingw]
when /sqlserver/