X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/611223d58fcdf5cc6ba434efed2c1ee9234b29a7..f6f4efcf298d5c37b5eb8a88eb164cf8b77ae928:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index bf778d1500..4a4419f806 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -35,12 +35,12 @@ GEM addressable (2.3.6) andand (1.3.3) arel (3.0.3) - arvados (0.1.20140414145041) + arvados (0.1.20140513131358) activesupport (>= 3.2.13) andand google-api-client (~> 0.6.3) json (>= 1.7.7) - arvados-cli (0.1.20140414145041) + arvados-cli (0.1.20140513131358) activesupport (~> 3.2, >= 3.2.13) andand (~> 1.3, >= 1.3.3) arvados (~> 0.1.0) @@ -99,7 +99,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 +108,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 +123,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,6 +135,9 @@ GEM rack rake (>= 0.8.1) pg (0.17.1) + pg_power (1.6.4) + pg + rails (~> 3.1) polyglot (0.3.4) rack (1.4.5) rack-cache (1.2) @@ -223,6 +226,7 @@ DEPENDENCIES omniauth-oauth2 (= 1.1.1) passenger pg + pg_power rails (~> 3.2.0) redis rvm-capistrano