X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9c40a72521dbfb4244d48069e4754a342f800492..96fe9fc822c2270cb6e4212798d61e61481ec2e0:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 460c58ea69..3167a75ba7 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.15) - actionpack (= 3.2.15) + actionmailer (3.2.17) + actionpack (= 3.2.17) mail (~> 2.5.4) - actionpack (3.2.15) - activemodel (= 3.2.15) - activesupport (= 3.2.15) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,33 +14,33 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.15) - activesupport (= 3.2.15) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.15) - activemodel (= 3.2.15) - activesupport (= 3.2.15) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.15) - activemodel (= 3.2.15) - activesupport (= 3.2.15) - activesupport (3.2.15) + activeresource (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - acts_as_api (0.4.1) + acts_as_api (0.4.2) activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.3.5) + addressable (2.3.6) andand (1.3.3) - arel (3.0.2) - arvados (0.1.20140328152103) + arel (3.0.3) + arvados (0.1.20140630151639) activesupport (>= 3.2.13) andand google-api-client (~> 0.6.3) json (>= 1.7.7) - arvados-cli (0.1.20140328152103) + arvados-cli (0.1.20140630151639) activesupport (~> 3.2, >= 3.2.13) andand (~> 1.3, >= 1.3.3) arvados (~> 0.1.0) @@ -66,14 +66,19 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.7.0) curb (0.8.5) - daemon_controller (1.1.7) + daemon_controller (1.2.0) + database_cleaner (1.2.0) erubis (2.7.0) + eventmachine (1.0.3) execjs (2.0.2) extlib (0.9.16) - faraday (0.8.8) + faraday (0.8.9) multipart-post (~> 1.2.0) + faye-websocket (0.7.2) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.3.1) google-api-client (0.6.4) addressable (>= 2.3.2) autoparse (>= 0.3.3) @@ -85,16 +90,16 @@ GEM signet (~> 0.4.5) uuidtools (>= 2.1.0) hashie (1.2.0) - highline (1.6.20) + highline (1.6.21) hike (1.2.3) - httpauth (0.2.0) - i18n (0.6.5) + httpauth (0.2.1) + i18n (0.6.9) journey (1.0.4) - jquery-rails (3.0.4) + jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) - jwt (0.1.8) + jwt (0.1.13) multi_json (>= 1.5) launchy (2.4.2) addressable (~> 2.3) @@ -102,14 +107,14 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.25) - multi_json (1.8.2) + mime-types (1.25.1) + multi_json (1.10.0) multipart-post (1.2.0) - net-scp (1.1.2) + net-scp (1.2.0) net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (2.7.0) + net-ssh (2.8.0) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) oauth2 (0.8.1) @@ -118,49 +123,53 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - oj (2.1.7) + oj (2.9.0) omniauth (1.1.1) hashie (~> 1.2) rack omniauth-oauth2 (1.1.1) oauth2 (~> 0.8.0) omniauth (~> 1.0) - passenger (4.0.23) - daemon_controller (>= 1.1.0) + passenger (4.0.41) + daemon_controller (>= 1.2.0) rack rake (>= 0.8.1) - pg (0.17.0) - polyglot (0.3.3) + 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) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.15) - actionmailer (= 3.2.15) - actionpack (= 3.2.15) - activerecord (= 3.2.15) - activeresource (= 3.2.15) - activesupport (= 3.2.15) + rails (3.2.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) bundler (~> 1.0) - railties (= 3.2.15) - railties (3.2.15) - actionpack (= 3.2.15) - activesupport (= 3.2.15) + railties (= 3.2.17) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.1.0) + rake (10.2.2) rdoc (3.12.2) json (~> 1.4) - redis (3.0.5) ref (1.0.5) rvm-capistrano (1.5.1) capistrano (~> 2.15.4) - sass (3.2.12) + sass (3.3.4) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -170,29 +179,35 @@ GEM faraday (~> 0.8.1) jwt (>= 0.1.5) multi_json (>= 1.0.0) + simplecov (0.7.1) + 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.8) - test_after_commit (0.2.2) + test_after_commit (0.2.3) themes_for_rails (0.5.1) rails (>= 3.0.0) - therubyracer (0.12.0) + therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref - thor (0.18.1) + thor (0.19.1) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) trollop (2.0) - tzinfo (0.3.38) - uglifier (2.3.0) + tzinfo (0.3.39) + uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) uuidtools (2.1.4) + websocket-driver (0.3.2) PLATFORMS ruby @@ -200,8 +215,10 @@ PLATFORMS DEPENDENCIES acts_as_api andand - arvados-cli (>= 0.1.20140328152103) + arvados-cli (>= 0.1.20140630151639) coffee-rails (~> 3.2.0) + database_cleaner + faye-websocket google-api-client (~> 0.6.3) jquery-rails multi_json @@ -210,11 +227,13 @@ DEPENDENCIES omniauth-oauth2 (= 1.1.1) passenger pg + pg_power + puma rails (~> 3.2.0) - redis rvm-capistrano sass-rails (>= 3.2.0) - sqlite3 + simplecov (~> 0.7.1) + simplecov-rcov test_after_commit themes_for_rails therubyracer