X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d394bc5c81dc488fc67cf3402e1074fafa1d9bcd..404f01707a7ff3911bb8122cda6936fc6d559a43:/services/api/Gemfile diff --git a/services/api/Gemfile b/services/api/Gemfile index 52a225c237..481cf5b42f 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 @@ -51,16 +50,11 @@ 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. Note: actual git commit is pinned via Gemfile.lock +gem 'arvados', git: 'https://github.com/arvados/arvados.git', glob: 'sdk/ruby/arvados.gemspec' gem 'httpclient' gem 'sshkey'