X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2cdc648b5367efd4c8e7b2ede93a2b3ba0871c17..fada92364f7ab0aa7074f1b260b4d79ca7ab55eb:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 5f66bb2220..8fb6a52eed 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -35,18 +35,20 @@ GEM addressable (2.3.6) andand (1.3.3) arel (3.0.3) - arvados (0.1.20140513131358) + arvados (0.1.20140708213257) activesupport (>= 3.2.13) andand google-api-client (~> 0.6.3) json (>= 1.7.7) - arvados-cli (0.1.20140513131358) + jwt (>= 0.1.5, < 1.0.0) + arvados-cli (0.1.20140708213257) activesupport (~> 3.2, >= 3.2.13) andand (~> 1.3, >= 1.3.3) arvados (~> 0.1.0) curb (~> 0.8) google-api-client (~> 0.6.3) json (~> 1.7, >= 1.7.7) + jwt (>= 0.1.5, < 1.0.0) oj (~> 2.0, >= 2.0.3) trollop (~> 2.0) autoparse (0.3.3) @@ -190,6 +192,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sshkey (1.6.1) test_after_commit (0.2.3) themes_for_rails (0.5.1) rails (>= 3.0.0) @@ -215,7 +218,7 @@ PLATFORMS DEPENDENCIES acts_as_api andand - arvados-cli (>= 0.1.20140328152103) + arvados-cli (>= 0.1.20140708213257) coffee-rails (~> 3.2.0) database_cleaner faye-websocket @@ -234,6 +237,7 @@ DEPENDENCIES sass-rails (>= 3.2.0) simplecov (~> 0.7.1) simplecov-rcov + sshkey test_after_commit themes_for_rails therubyracer