X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d394bc5c81dc488fc67cf3402e1074fafa1d9bcd..44c93373e97da98645d41ae8f09c6eef6788bb26:/services/api/Gemfile diff --git a/services/api/Gemfile b/services/api/Gemfile index 52a225c237..30d877fac7 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -4,12 +4,11 @@ source 'https://rubygems.org' -gem 'rails', '~> 5.0.0' +gem 'rails', '~> 5.2.0' gem 'responders', '~> 2.0' group :test, :development do gem 'factory_bot_rails' - gem 'database_cleaner' # 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 @@ -23,6 +22,7 @@ group :test, :development do gem 'simplecov-rcov', require: false gem 'mocha', require: false gem 'byebug' + gem 'listen' end gem 'pg', '~> 1.0' @@ -30,13 +30,8 @@ gem 'pg', '~> 1.0' gem 'multi_json' gem 'oj' -gem 'therubyracer' -gem 'uglifier', '~> 2.0' - gem 'jquery-rails' -gem 'rvm-capistrano', :group => :test - gem 'acts_as_api' gem 'passenger' @@ -44,23 +39,14 @@ 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 'optimist' -gem 'faye-websocket' gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails' -# We need arvados-cli because of crunchv1. Note: bundler can't handle -# two gems with the same "git" url but different "glob" values, hence -# the use of a wildcard here instead of literal paths -# (sdk/cli/arvados-cli.gem and sdk/ruby/arvados.gem). -gem 'arvados-cli', git: 'https://github.com/arvados/arvados.git', glob: 'sdk/*/*.gemspec' -gem 'arvados', git: 'https://github.com/arvados/arvados.git', glob: 'sdk/*/*.gemspec' +# Import arvados gem. +gem 'arvados', '~> 2.1.5' gem 'httpclient' gem 'sshkey' @@ -73,8 +59,6 @@ gem 'rails-observers' gem 'rails-perftest' gem 'rails-controller-testing' -gem 'sass-rails' - # arvados-google-api-client and googleauth depend on signet, but # signet 0.12 is incompatible with ruby 2.3. gem 'signet', '< 0.12'