projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18874: Merge commit '6f8dcb2b13f3058db656908fb26b09e23b527f08' into 18874-merge-wb2
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index 4cb5671e1801fc75107057da949653482cbf8430..21f0232ef0d020b8afbb94a29a1d8b90a6b1e0a5 100644
(file)
--- a/
services/api/Gemfile
+++ b/
services/api/Gemfile
@@
-4,14
+4,20
@@
source 'https://rubygems.org'
source 'https://rubygems.org'
-gem 'rails', '~>
4
.0'
+gem 'rails', '~>
5.2
.0'
gem 'responders', '~> 2.0'
gem 'responders', '~> 2.0'
-gem 'protected_attributes'
+
+# Pin sprockets to < 4.0 to avoid issues when upgrading rails to 5.2
+# See: https://github.com/rails/sprockets-rails/issues/443
+gem 'sprockets', '~> 3.0'
group :test, :development do
group :test, :development do
- gem 'factory_girl_rails'
- gem 'database_cleaner'
- gem 'ruby-prof'
+ gem 'factory_bot_rails'
+
+ # As of now (2019-03-27) There's an open issue about incompatibilities with
+ # newer versions of this gem: https://github.com/rails/rails-perftest/issues/38
+ gem 'ruby-prof', '~> 0.15.0'
+
# Note: "require: false" here tells bunder not to automatically
# 'require' the packages during application startup. Installation is
# still mandatory.
# Note: "require: false" here tells bunder not to automatically
# 'require' the packages during application startup. Installation is
# still mandatory.
@@
-19,53
+25,49
@@
group :test, :development do
gem 'simplecov', '~> 0.7.1', require: false
gem 'simplecov-rcov', require: false
gem 'mocha', require: false
gem 'simplecov', '~> 0.7.1', require: false
gem 'simplecov-rcov', require: false
gem 'mocha', require: false
+ gem 'byebug'
+ gem 'listen'
end
end
-# pg is the only supported database driver.
-gem 'pg'
+gem 'pg', '~> 1.0'
gem 'multi_json'
gem 'oj'
gem 'multi_json'
gem 'oj'
-gem 'oj_mimic_json'
-
-# for building assets
-gem 'sass-rails', '~> 4.0'
-gem 'coffee-rails', '~> 4.0'
-gem 'therubyracer'
-gem 'uglifier', '~> 2.0'
gem 'jquery-rails'
gem 'jquery-rails'
-gem 'rvm-capistrano', :group => :test
-
gem 'acts_as_api'
gem 'passenger'
gem 'acts_as_api'
gem 'passenger'
-# Restricted because omniauth >= 1.5.0 requires Ruby >= 2.1.9:
-gem 'omniauth', '~> 1.4.0'
-gem 'omniauth-oauth2', '~> 1.1'
+# Locking to 5.10.3 to workaround issue in 5.11.1 (https://github.com/seattlerb/minitest/issues/730)
+gem 'minitest', '5.10.3'
gem 'andand'
gem 'andand'
-gem '
test_after_commit', :group => :test
+gem '
optimist'
-gem 'trollop'
-gem 'faye-websocket'
+gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails'
-gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails'
-
-gem 'arvados', '>= 0.1.20150615153458'
-gem 'arvados-cli', '>= 0.1.20161017193526'
+# Import arvados gem.
+gem 'arvados', '~> 2.1.5'
gem 'httpclient'
gem 'httpclient'
-gem 'sshkey'
gem 'safe_yaml'
gem 'lograge'
gem 'logstash-event'
gem 'rails-observers'
gem 'safe_yaml'
gem 'lograge'
gem 'logstash-event'
gem 'rails-observers'
+gem 'rails-perftest'
+gem 'rails-controller-testing'
+
+gem 'mini_portile2', '~> 2.8', '>= 2.8.1'
+
+# arvados-google-api-client and googleauth depend on signet, but
+# signet 0.12 is incompatible with ruby 2.3.
+gem 'signet', '< 0.12'
+
# Install any plugin gems
Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f|
eval(IO.read(f), binding)
# Install any plugin gems
Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f|
eval(IO.read(f), binding)