X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/08bfcb57a26006243f12caa13aaa03cdcae44ed3..4eba2cb5d7d6a5d76b9ce4d3f535a1de911400cd:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 390d43f7e8..39718bda44 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -1,40 +1,58 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: - actionmailer (3.1.10) - actionpack (= 3.1.10) - mail (~> 2.3.3) - actionpack (3.1.10) - activemodel (= 3.1.10) - activesupport (= 3.1.10) + actionmailer (3.2.15) + actionpack (= 3.2.15) + mail (~> 2.5.4) + actionpack (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) builder (~> 3.0.0) erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.6) + journey (~> 1.0.4) + rack (~> 1.4.5) rack-cache (~> 1.2) - rack-mount (~> 0.8.2) rack-test (~> 0.6.1) - sprockets (~> 2.0.4) - activemodel (3.1.10) - activesupport (= 3.1.10) + sprockets (~> 2.2.1) + activemodel (3.2.15) + activesupport (= 3.2.15) builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.10) - activemodel (= 3.1.10) - activesupport (= 3.1.10) - arel (~> 2.2.3) + activerecord (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) + arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.1.10) - activemodel (= 3.1.10) - activesupport (= 3.1.10) - activesupport (3.1.10) - multi_json (>= 1.0, < 1.3) + activeresource (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) + activesupport (3.2.15) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) acts_as_api (0.4.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) + addressable (2.3.5) andand (1.3.3) - arel (2.2.3) + arel (3.0.2) + arvados (0.1.20140328152103) + activesupport (>= 3.2.13) + andand + google-api-client (~> 0.6.3) + json (>= 1.7.7) + arvados-cli (0.1.20140328152103) + 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) + oj (~> 2.0, >= 2.0.3) + trollop (~> 2.0) + autoparse (0.3.3) + addressable (>= 2.3.1) + extlib (>= 0.9.15) + multi_json (>= 1.0.0) builder (3.0.4) capistrano (2.15.5) highline @@ -42,36 +60,50 @@ GEM net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) - coffee-rails (3.1.1) + coffee-rails (3.2.1) coffee-script (>= 2.2.0) - railties (~> 3.1.0) + railties (~> 3.2.0.beta) coffee-script (2.2.0) coffee-script-source execjs coffee-script-source (1.6.3) + curb (0.8.5) daemon_controller (1.1.7) erubis (2.7.0) execjs (2.0.2) + extlib (0.9.16) faraday (0.8.8) multipart-post (~> 1.2.0) + google-api-client (0.6.4) + addressable (>= 2.3.2) + autoparse (>= 0.3.3) + extlib (>= 0.9.15) + faraday (~> 0.8.4) + jwt (>= 0.1.5) + launchy (>= 2.1.1) + multi_json (>= 1.0.0) + signet (~> 0.4.5) + uuidtools (>= 2.1.0) hashie (1.2.0) highline (1.6.20) hike (1.2.3) httpauth (0.2.0) i18n (0.6.5) + journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) - jwt (0.1.6) - multi_json (>= 1.0) + jwt (0.1.8) + multi_json (>= 1.5) + launchy (2.4.2) + addressable (~> 2.3) libv8 (3.16.14.3) - mail (2.3.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25) - multi_json (1.2.0) + multi_json (1.8.2) multipart-post (1.2.0) net-scp (1.1.2) net-ssh (>= 2.6.5) @@ -99,30 +131,28 @@ GEM rake (>= 0.8.1) pg (0.17.0) polyglot (0.3.3) - rack (1.3.10) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.1.10) - actionmailer (= 3.1.10) - actionpack (= 3.1.10) - activerecord (= 3.1.10) - activeresource (= 3.1.10) - activesupport (= 3.1.10) + rails (3.2.15) + actionmailer (= 3.2.15) + actionpack (= 3.2.15) + activerecord (= 3.2.15) + activeresource (= 3.2.15) + activesupport (= 3.2.15) bundler (~> 1.0) - railties (= 3.1.10) - railties (3.1.10) - actionpack (= 3.1.10) - activesupport (= 3.1.10) + railties (= 3.2.15) + railties (3.2.15) + actionpack (= 3.2.15) + activesupport (= 3.2.15) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) + thor (>= 0.14.6, < 2.0) rake (10.1.0) rdoc (3.12.2) json (~> 1.4) @@ -130,28 +160,37 @@ GEM ref (1.0.5) rvm-capistrano (1.5.1) capistrano (~> 2.15.4) - sass (3.1.21) - sass-rails (3.1.5) - actionpack (~> 3.1.0) - railties (~> 3.1.0) - sass (~> 3.1.10) - tilt (~> 1.3.2) - sprockets (2.0.4) + sass (3.2.12) + sass-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + signet (0.4.5) + addressable (>= 2.2.3) + faraday (~> 0.8.1) + jwt (>= 0.1.5) + multi_json (>= 1.0.0) + 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) therubyracer (0.12.0) libv8 (~> 3.16.14.0) ref - thor (0.14.6) - tilt (1.3.7) + thor (0.18.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) execjs (>= 0.3.0) json (>= 1.8.0) + uuidtools (2.1.4) PLATFORMS ruby @@ -159,7 +198,9 @@ PLATFORMS DEPENDENCIES acts_as_api andand - coffee-rails (~> 3.1.1) + arvados-cli (>= 0.1.20140328152103) + coffee-rails (~> 3.2.0) + google-api-client (~> 0.6.3) jquery-rails multi_json oj @@ -167,9 +208,12 @@ DEPENDENCIES omniauth-oauth2 (= 1.1.1) passenger pg - rails (= 3.1.10) + rails (~> 3.2.0) redis rvm-capistrano - sass-rails (= 3.1.5) + sass-rails (>= 3.2.0) + sqlite3 + test_after_commit therubyracer + trollop uglifier (>= 1.0.3)