X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/aeb966ee09166bf074ea19a4a2dd5045ca795a98..bc408e4ada3c5ee173961b9c61600e3ddf76b88a:/services/api/Gemfile diff --git a/services/api/Gemfile b/services/api/Gemfile index c91495d8f5..00e9ae0b06 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 4.2' +gem 'rails', '~> 5.0.0' gem 'responders', '~> 2.0' group :test, :development do @@ -31,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' @@ -45,15 +42,16 @@ 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' @@ -68,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)