diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 132 |
1 files changed, 80 insertions, 52 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index af48c2d4b..62258c0c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,37 +18,36 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.1.12) - actionpack (= 3.1.12) - mail (~> 2.4.4) - actionpack (3.1.12) - activemodel (= 3.1.12) - activesupport (= 3.1.12) + actionmailer (3.2.16) + actionpack (= 3.2.16) + mail (~> 2.5.4) + actionpack (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) 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.12) - activesupport (= 3.1.12) + sprockets (~> 2.2.1) + activemodel (3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.12) - activemodel (= 3.1.12) - activesupport (= 3.1.12) - arel (~> 2.2.3) + activerecord (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) + arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.1.12) - activemodel (= 3.1.12) - activesupport (= 3.1.12) - activesupport (3.1.12) + activeresource (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) + activesupport (3.2.16) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) annotate (2.5.0) rake - arel (2.2.3) + arel (3.0.3) bootstrap-sass (2.3.1.2) sass (~> 3.2) builder (3.0.4) @@ -60,12 +59,21 @@ GEM net-ssh-gateway (>= 1.1.0) charlock_holmes (0.6.9.4) chunky_png (1.2.8) + coffee-rails (3.2.2) + coffee-script (>= 2.2.0) + railties (~> 3.2.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.6.3) colorize (0.5.8) columnize (0.3.6) compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) + compass-rails (1.0.3) + compass (>= 0.12.2, < 0.14) coveralls (0.6.7) colorize multi_json (~> 1.3) @@ -85,6 +93,8 @@ GEM eventmachine (1.0.3) exception_notification (3.0.1) actionmailer (>= 3.0.4) + activesupport (>= 3.0.4) + execjs (2.0.1) factory_girl (2.6.4) activesupport (>= 2.3.9) factory_girl_rails (1.7.0) @@ -102,18 +112,21 @@ GEM haml (4.0.3) tilt highline (1.6.19) - hike (1.2.2) + hike (1.2.3) i18n (0.6.9) - jquery-rails (2.3.0) + journey (1.0.4) + jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + jquery-ui-rails (4.1.0) + railties (>= 3.1.0) + json (1.8.1) + libv8 (3.16.14.3) linecache (0.46) rbx-require-relative (> 0.0.4) locale (2.0.8) mahoro (0.4) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mailcatcher (0.5.11) @@ -126,8 +139,8 @@ GEM sqlite3 (~> 1.3) thin (~> 1.5.0) memcache-client (1.8.5) - mime-types (1.23) - multi_json (1.7.4) + mime-types (1.25.1) + multi_json (1.8.2) net-http-local (0.1.2) net-purge (0.1.0) net-scp (1.1.1) @@ -144,39 +157,38 @@ GEM railties (~> 3.0) pg (0.15.1) 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-protection (1.5.0) rack rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.1.12) - actionmailer (= 3.1.12) - actionpack (= 3.1.12) - activerecord (= 3.1.12) - activeresource (= 3.1.12) - activesupport (= 3.1.12) + rails (3.2.16) + actionmailer (= 3.2.16) + actionpack (= 3.2.16) + activerecord (= 3.2.16) + activeresource (= 3.2.16) + activesupport (= 3.2.16) bundler (~> 1.0) - railties (= 3.1.12) + railties (= 3.2.16) rails-i18n (0.7.3) i18n (~> 0.5) - railties (3.1.12) - actionpack (= 3.1.12) - activesupport (= 3.1.12) + railties (3.2.16) + actionpack (= 3.2.16) + activesupport (= 3.2.16) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) + thor (>= 0.14.6, < 2.0) rake (0.9.2.2) rbx-require-relative (0.0.9) rdoc (3.12.2) json (~> 1.4) recaptcha (0.3.5) + ref (1.0.5) rest-client (1.6.7) mime-types (>= 1.16) rmagick (2.13.2) @@ -202,7 +214,11 @@ GEM ruby-ole (>= 1.2.8) vpim (>= 0.360) ruby-ole (1.2.11.6) - sass (3.2.9) + sass (3.2.10) + sass-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) @@ -218,27 +234,34 @@ GEM spork-rails (3.2.1) rails (>= 3.0.0, < 3.3.0) spork (>= 1.0rc0) - sprockets (2.0.4) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) statistics2 (0.54) syslog_protocol (0.9.2) text (1.2.1) + therubyracer (0.12.0) + libv8 (~> 3.16.14.0) + ref thin (1.5.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.14.6) + thor (0.18.1) tilt (1.4.1) - treetop (1.4.12) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) + tzinfo (0.3.38) + uglifier (2.2.1) + execjs (>= 0.3.0) + multi_json (~> 1.0, >= 1.0.2) unicode (0.4.4) unidecoder (1.1.2) - vpim (0.695) + vpim (13.11.11) webrat (0.7.3) nokogiri (>= 1.2.0) rack (>= 1.0) @@ -257,7 +280,8 @@ DEPENDENCIES bootstrap-sass capistrano charlock_holmes - compass + coffee-rails (~> 3.2.1) + compass-rails coveralls debugger dynamic_form @@ -269,7 +293,8 @@ DEPENDENCIES gettext gettext_i18n_rails globalize3! - jquery-rails (~> 2.1) + jquery-rails (~> 3.0.4) + jquery-ui-rails json locale mahoro @@ -281,7 +306,7 @@ DEPENDENCIES nokogiri pg rack - rails (= 3.1.12) + rails (= 3.2.16) rails-i18n rake (= 0.9.2.2) rdoc @@ -291,10 +316,13 @@ DEPENDENCIES rspec-rails ruby-debug ruby-msg (~> 1.5.0) + sass-rails (~> 3.2.3) spork-rails statistics2 (~> 0.54) syslog_protocol + therubyracer thin + uglifier (>= 1.0.3) unicode unidecoder vpim |