X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ecf6627111838530f64ffcd689e11d987cc7bf2f..ff353df24233b40612eb228a8024ea30902397e9:/services/api/Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 34e88a85e6..7d4d4bba17 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -4,7 +4,7 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.0'
+gem 'rails', '~> 4.2'
 gem 'responders', '~> 2.0'
 gem 'protected_attributes'
 
@@ -21,8 +21,14 @@ group :test, :development do
   gem 'mocha', require: false
 end
 
+# We'll need to update related code prior to Rails 5.
+# See: https://github.com/rails/activerecord-deprecated_finders
+gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
+
 # pg is the only supported database driver.
-gem 'pg'
+# Note: Rails 4.2 is not compatible with pg 1.0
+#       (See: https://github.com/rails/rails/pull/31671)
+gem 'pg', '~> 0.18'
 
 gem 'multi_json'
 gem 'oj'
@@ -59,7 +65,6 @@ gem 'arvados', '>= 0.1.20150615153458'
 gem 'arvados-cli', '>= 0.1.20161017193526'
 gem 'httpclient'
 
-gem 'puma', '~> 2.0'
 gem 'sshkey'
 gem 'safe_yaml'
 gem 'lograge'