projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13493: Merge branch 'master' into 13493-federation-proxy
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index 4474c49e6a5997fa7006f81b04d9fd5ee1d02513..135b8d1d07e1fc6332f1320f614744eef4054dcd 100644
(file)
--- a/
services/api/Gemfile
+++ b/
services/api/Gemfile
@@
-1,6
+1,10
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
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'
@@
-17,12
+21,17
@@
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'
-gem 'oj_mimic_json'
# for building assets
gem 'sass-rails', '~> 4.0'
# for building assets
gem 'sass-rails', '~> 4.0'
@@
-52,9
+61,8
@@
gem 'faye-websocket'
gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails'
gem 'arvados', '>= 0.1.20150615153458'
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 'puma', '~> 2.0'
gem 'sshkey'
gem 'safe_yaml'
gem 'lograge'
gem 'sshkey'
gem 'safe_yaml'
gem 'lograge'