X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/611223d58fcdf5cc6ba434efed2c1ee9234b29a7..fad046d56740092b1483cb646d2f7c92c544c165:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index bf778d1500..d704ecada7 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.20140414145041) + arvados (0.1.20140708213257) activesupport (>= 3.2.13) andand google-api-client (~> 0.6.3) json (>= 1.7.7) - arvados-cli (0.1.20140414145041) + 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) @@ -99,7 +101,7 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) - jwt (0.1.11) + jwt (0.1.13) multi_json (>= 1.5) launchy (2.4.2) addressable (~> 2.3) @@ -108,7 +110,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - multi_json (1.9.2) + multi_json (1.10.0) multipart-post (1.2.0) net-scp (1.2.0) net-ssh (>= 2.6.5) @@ -123,7 +125,7 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - oj (2.7.3) + oj (2.9.0) omniauth (1.1.1) hashie (~> 1.2) rack @@ -135,7 +137,12 @@ GEM rack rake (>= 0.8.1) pg (0.17.1) + pg_power (1.6.4) + pg + rails (~> 3.1) polyglot (0.3.4) + puma (2.8.2) + rack (>= 1.1, < 2.0) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) @@ -161,7 +168,6 @@ GEM rake (10.2.2) rdoc (3.12.2) json (~> 1.4) - redis (3.0.7) ref (1.0.5) rvm-capistrano (1.5.1) capistrano (~> 2.15.4) @@ -211,7 +217,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 @@ -223,8 +229,9 @@ DEPENDENCIES omniauth-oauth2 (= 1.1.1) passenger pg + pg_power + puma rails (~> 3.2.0) - redis rvm-capistrano sass-rails (>= 3.2.0) simplecov (~> 0.7.1)