projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13377-block-sig-time' refs #13377
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index 4cb5671e1801fc75107057da949653482cbf8430..7d4d4bba176591a97e2d166c6e291e4588dbe99e 100644
(file)
--- a/
services/api/Gemfile
+++ b/
services/api/Gemfile
@@
-4,7
+4,7
@@
source 'https://rubygems.org'
source 'https://rubygems.org'
-gem 'rails', '~> 4.
0
'
+gem 'rails', '~> 4.
2
'
gem 'responders', '~> 2.0'
gem 'protected_attributes'
gem 'responders', '~> 2.0'
gem 'protected_attributes'
@@
-21,8
+21,14
@@
group :test, :development do
gem 'mocha', require: false
end
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.
# 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 'multi_json'
gem 'oj'