X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8f987a9271eda80697b3a8fc53e7ebb0f93816f9..9d413ff4e3868761422f79b4f81177cec05cbae5:/services/api/Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 4cb5671e18..0dc38f1e72 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,12 +21,20 @@ group :test, :development do
   gem 'mocha', require: false
 end
 
+# We need this dependency because of crunchv1
+gem 'arvados-cli'
+
+# 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'
-gem 'oj_mimic_json'
 
 # for building assets
 gem 'sass-rails',   '~> 4.0'
@@ -56,7 +64,6 @@ gem 'faye-websocket'
 gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails'
 
 gem 'arvados', '>= 0.1.20150615153458'
-gem 'arvados-cli', '>= 0.1.20161017193526'
 gem 'httpclient'
 
 gem 'sshkey'