X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e2cc6c1935565ee965f38501a4974e9d0e6b29e5..bc408e4ada3c5ee173961b9c61600e3ddf76b88a:/services/api/Gemfile?ds=sidebyside

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 135b8d1d07..00e9ae0b06 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -4,12 +4,11 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.2'
+gem 'rails', '~> 5.0.0'
 gem 'responders', '~> 2.0'
-gem 'protected_attributes'
 
 group :test, :development do
-  gem 'factory_girl_rails'
+  gem 'factory_bot_rails'
   gem 'database_cleaner'
   gem 'ruby-prof'
   # Note: "require: false" here tells bunder not to automatically
@@ -21,9 +20,8 @@ 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'
+# We need this dependency because of crunchv1
+gem 'arvados-cli'
 
 # pg is the only supported database driver.
 # Note: Rails 4.2 is not compatible with pg 1.0
@@ -33,9 +31,6 @@ gem 'pg', '~> 0.18'
 gem 'multi_json'
 gem 'oj'
 
-# for building assets
-gem 'sass-rails',   '~> 4.0'
-gem 'coffee-rails', '~> 4.0'
 gem 'therubyracer'
 gem 'uglifier', '~> 2.0'
 
@@ -47,20 +42,21 @@ gem 'acts_as_api'
 
 gem 'passenger'
 
+# Locking to 5.10.3 to workaround issue in 5.11.1 (https://github.com/seattlerb/minitest/issues/730)
+gem 'minitest', '5.10.3'
+
 # Restricted because omniauth >= 1.5.0 requires Ruby >= 2.1.9:
 gem 'omniauth', '~> 1.4.0'
 gem 'omniauth-oauth2', '~> 1.1'
 
 gem 'andand'
 
-gem 'test_after_commit', :group => :test
-
-gem 'trollop'
+gem 'optimist'
 gem 'faye-websocket'
 
 gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails'
 
-gem 'arvados', '>= 0.1.20150615153458'
+gem 'arvados', '>= 1.3.1.20190301212059'
 gem 'httpclient'
 
 gem 'sshkey'
@@ -70,6 +66,9 @@ gem 'logstash-event'
 
 gem 'rails-observers'
 
+gem 'rails-perftest'
+gem 'rails-controller-testing'
+
 # Install any plugin gems
 Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f|
     eval(IO.read(f), binding)