Merge branch '10081-cwl-run-same-job' into 9988-cwl-arv-hints

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 0b2ae5dd95adf5d2ada7a2b23a7c2cec3a515e8d..5134fc4ce82d68bf4b00da91a4bedaa10e7f7e1e 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -14,6 +14,7 @@ group :test, :development do
   # still mandatory.
   gem 'simplecov', '~> 0.7.1', require: false
   gem 'simplecov-rcov', require: false
+  gem 'mocha', require: false
 end
 
 # This might not be needed in :test and :development, but we load it
@@ -66,17 +67,19 @@ gem 'andand'
 
 gem 'test_after_commit', :group => :test
 
-gem 'google-api-client', '~> 0.6.3'
 gem 'trollop'
 gem 'faye-websocket'
 
 gem 'themes_for_rails'
 
-gem 'arvados', '>= 0.1.20140919104705'
-gem 'arvados-cli', '>= 0.1.20150121183928'
+gem 'arvados', '>= 0.1.20150615153458'
+gem 'arvados-cli', '>= 0.1.20151207150126'
 
 # pg_power lets us use partial indexes in schema.rb in Rails 3
 gem 'pg_power'
 
 gem 'puma'
 gem 'sshkey'
+gem 'safe_yaml'
+gem 'lograge'
+gem 'logstash-event'