X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a6041085ca126349efa3e22d2e90e9e8fd7be6a9..0e4203db1f9b8030c0c9b64bf33e41055fa4f5be:/apps/workbench/Gemfile.lock diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock index afdff9410c..7f4dc8e289 100644 --- a/apps/workbench/Gemfile.lock +++ b/apps/workbench/Gemfile.lock @@ -2,44 +2,41 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (3.2.11) - actionpack (= 3.2.11) - mail (~> 2.4.4) - actionpack (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + 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) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.11) - activesupport (= 3.2.11) + activemodel (3.2.15) + activesupport (= 3.2.15) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - activesupport (3.2.11) - i18n (~> 0.6) + 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) andand (1.3.3) - anjlab-bootstrap-rails (2.3.1.2) - railties (>= 3.0) - sass (>= 3.2) arel (3.0.2) - bootstrap-editable-rails (0.0.5) - railties (>= 3.1) - bootstrap-rails (0.0.7) - railties (~> 3.1) + bootstrap-sass (3.1.0.1) + sass (~> 3.2) + bootstrap-x-editable-rails (1.5.1.1) + railties (>= 3.0) builder (3.0.4) - capistrano (2.15.4) + capistrano (2.15.5) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) @@ -51,45 +48,43 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.2) - commonjs (0.2.6) - daemon_controller (1.1.4) + coffee-script-source (1.6.3) + commonjs (0.2.7) + daemon_controller (1.1.7) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - highline (1.6.19) + execjs (2.0.2) + highline (1.6.20) hike (1.2.3) - i18n (0.6.4) + httpclient (2.3.4.1) + i18n (0.6.5) journey (1.0.4) - jquery-rails (3.0.0) + jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) - less (2.3.2) - commonjs (~> 0.2.6) - less-rails (2.3.3) + json (1.8.1) + less (2.4.0) + commonjs (~> 0.2.7) + less-rails (2.4.2) actionpack (>= 3.1) - less (~> 2.3.1) - libv8 (3.11.8.17) - mail (2.4.4) - i18n (>= 0.4.0) + less (~> 2.4.0) + libv8 (3.16.14.3) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.23) - multi_json (1.7.6) - net-scp (1.1.1) + mime-types (1.25) + multi_json (1.8.2) + net-scp (1.1.2) net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (2.6.7) + net-ssh (2.7.0) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - oj (2.0.14) - passenger (4.0.5) + oj (2.1.7) + passenger (4.0.23) daemon_controller (>= 1.1.0) rack rake (>= 0.8.1) - pg (0.15.1) piwik_analytics (1.0.2) actionpack activesupport @@ -102,28 +97,28 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.11) - actionmailer (= 3.2.11) - actionpack (= 3.2.11) - activerecord (= 3.2.11) - activeresource (= 3.2.11) - activesupport (= 3.2.11) + 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.2.11) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + 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, < 2.0) - rake (10.0.4) + rake (10.1.0) rdoc (3.12.2) json (~> 1.4) ref (1.0.5) - rvm-capistrano (1.3.0) - capistrano (>= 2.0.0) - sass (3.2.9) + 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) @@ -133,24 +128,21 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.7) - therubyracer (0.11.4) - libv8 (~> 3.11.8.12) + sqlite3 (1.3.8) + themes_for_rails (0.5.1) + rails (>= 3.0.0) + therubyracer (0.12.0) + libv8 (~> 3.16.14.0) ref thor (0.18.1) tilt (1.4.1) - treetop (1.4.14) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - twitter-bootstrap-rails (2.2.7) - actionpack (>= 3.1) - execjs - rails (>= 3.1) - railties (>= 3.1) - tzinfo (0.3.37) - uglifier (2.1.1) + tzinfo (0.3.38) + uglifier (2.3.1) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) PLATFORMS ruby @@ -158,22 +150,22 @@ PLATFORMS DEPENDENCIES RedCloth andand - anjlab-bootstrap-rails (>= 2.2) - bootstrap-editable-rails - bootstrap-rails - coffee-rails (~> 3.2.1) + bootstrap-sass (~> 3.1.0) + bootstrap-x-editable-rails + coffee-rails (~> 3.2.0) + httpclient jquery-rails less less-rails multi_json oj passenger - pg piwik_analytics - rails (= 3.2.11) + rails (~> 3.2.0) rvm-capistrano - sass-rails (~> 3.2.3) + sass + sass-rails (~> 3.2.0) sqlite3 + themes_for_rails therubyracer - twitter-bootstrap-rails uglifier (>= 1.0.3)