X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b2addc8887d200219b44121c87a7a44bf4566e42..1ab33aed37fdcd448fe224375951089282901c48:/services/api/Gemfile diff --git a/services/api/Gemfile b/services/api/Gemfile index 6d42956940..18797d69c6 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -25,9 +25,6 @@ group :test, :development do gem 'byebug' end -# We need this dependency because of crunchv1 -gem 'arvados-cli' - gem 'pg', '~> 1.0' gem 'multi_json' @@ -54,11 +51,11 @@ gem 'omniauth-oauth2', '~> 1.1' gem 'andand' gem 'optimist' -gem 'faye-websocket' -gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails' +gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails' -gem 'arvados', '>= 1.3.1.20190301212059' +# 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' @@ -71,6 +68,12 @@ 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' + # Install any plugin gems Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f| eval(IO.read(f), binding)