Merge branch 'master' into 2525-java-sdk

[arvados.git] / services / api / Gemfile.lock

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 21af64abc8606574dc9d5991a979e64d7c55121d..d574644644aa1c94dfab216d982d78bc637d7b2c 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -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)
@@ -179,12 +182,13 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.9)
     test_after_commit (0.2.3)
     themes_for_rails (0.5.1)
       rails (>= 3.0.0)
@@ -222,12 +226,13 @@ DEPENDENCIES
   omniauth-oauth2 (= 1.1.1)
   passenger
   pg
+  pg_power
   rails (~> 3.2.0)
   redis
   rvm-capistrano
   sass-rails (>= 3.2.0)
   simplecov (~> 0.7.1)
-  sqlite3
+  simplecov-rcov
   test_after_commit
   themes_for_rails
   therubyracer