X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/43773cb247a1fb744b57070b715bfa5d53a00822..25ee81e0c1980924518a37156a3e741c8025d46b:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 8a80c7765a..3929125b37 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -1,165 +1,163 @@ 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) - arel (2.2.3) + andand (1.3.3) + arel (3.0.2) builder (3.0.4) - capistrano (2.14.1) + capistrano (2.15.5) highline net-scp (>= 1.0.0) 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.4.0) - daemon_controller (1.1.0) + coffee-script-source (1.6.3) + daemon_controller (1.1.7) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - faraday (0.8.4) - multipart-post (~> 1.1) - fastthread (1.0.7) + execjs (2.0.2) + faraday (0.8.8) + multipart-post (~> 1.2.0) hashie (1.2.0) - highline (1.6.15) - hike (1.2.1) + highline (1.6.20) + hike (1.2.3) httpauth (0.2.0) - i18n (0.6.1) - jquery-rails (2.1.4) + 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.7.6) - jwt (0.1.5) - multi_json (>= 1.0) - libv8 (3.11.8.13) - mail (2.3.3) - i18n (>= 0.4.0) + json (1.8.1) + jwt (0.1.8) + multi_json (>= 1.5) + libv8 (3.16.14.3) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) - multi_json (1.2.0) - multipart-post (1.1.5) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) - net-ssh (2.6.3) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) - oauth2 (0.8.0) + mime-types (1.25) + multi_json (1.8.2) + multipart-post (1.2.0) + net-scp (1.1.2) + net-ssh (>= 2.6.5) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.7.0) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) + oauth2 (0.8.1) faraday (~> 0.8) httpauth (~> 0.1) jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - oj (2.0.3) + oj (2.1.7) omniauth (1.1.1) hashie (~> 1.2) rack omniauth-oauth2 (1.1.1) oauth2 (~> 0.8.0) omniauth (~> 1.0) - passenger (3.0.19) - daemon_controller (>= 1.0.0) - fastthread (>= 1.0.1) + passenger (4.0.23) + daemon_controller (>= 1.1.0) rack rake (>= 0.8.1) - pg (0.14.1) + pg (0.17.0) polyglot (0.3.3) - rack (1.3.9) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-ssl (1.3.2) + 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) - rake (10.0.3) - rdoc (3.12) + thor (>= 0.14.6, < 2.0) + rake (10.1.0) + rdoc (3.12.2) json (~> 1.4) - ref (1.0.2) - rvm-capistrano (1.2.7) - capistrano (>= 2.0.0) - 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) + redis (3.0.5) + ref (1.0.5) + rvm-capistrano (1.5.1) + capistrano (~> 2.15.4) + sass (3.2.12) + sass-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - therubyracer (0.11.3) - libv8 (~> 3.11.8.12) + test_after_commit (0.2.2) + therubyracer (0.12.0) + libv8 (~> 3.16.14.0) ref - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.12) + thor (0.18.1) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.35) - uglifier (1.3.0) + tzinfo (0.3.38) + uglifier (2.3.0) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) PLATFORMS ruby DEPENDENCIES acts_as_api - coffee-rails (~> 3.1.1) + andand + coffee-rails (~> 3.2.0) jquery-rails multi_json oj @@ -167,8 +165,10 @@ 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) + test_after_commit therubyracer uglifier (>= 1.0.3)