X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ff2e2d7b53edfec33a77ad1ff2b5a83f02a5be80..08fbba821251a58cc99921cb477fbbc076a1bfee:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index d27f2bf427..c4b269e357 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -35,18 +35,18 @@ GEM addressable (2.3.6) andand (1.3.3) arel (3.0.3) - arvados (0.1.20140812162850) + arvados (0.1.20140919104705) activesupport (>= 3.2.13) andand google-api-client (~> 0.6.3) json (>= 1.7.7) jwt (>= 0.1.5, < 1.0.0) - arvados-cli (0.1.20140812162850) + arvados-cli (0.1.20141014153331) activesupport (~> 3.2, >= 3.2.13) andand (~> 1.3, >= 1.3.3) - arvados (~> 0.1.0) + arvados (~> 0.1, >= 0.1.0) curb (~> 0.8) - google-api-client (~> 0.6.3) + google-api-client (~> 0.6, >= 0.6.3) json (~> 1.7, >= 1.7.7) jwt (>= 0.1.5, < 1.0.0) oj (~> 2.0, >= 2.0.3) @@ -130,7 +130,7 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - oj (2.10.0) + oj (2.10.2) omniauth (1.1.1) hashie (~> 1.2) rack @@ -223,7 +223,8 @@ PLATFORMS DEPENDENCIES acts_as_api andand - arvados-cli (>= 0.1.20140708213257) + arvados (>= 0.1.20140919104705) + arvados-cli (>= 0.1.20141010134550) coffee-rails (~> 3.2.0) database_cleaner factory_girl_rails