diff --git a/Gemfile.lock b/Gemfile.lock index 24b261a1f0..9455b58eb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,12 +9,12 @@ GIT PATH remote: . specs: - actionmailer (3.2.17) - actionpack (= 3.2.17) + actionmailer (3.2.19) + actionpack (= 3.2.19) mail (~> 2.5.4) - actionpack (3.2.17) - activemodel (= 3.2.17) - activesupport (= 3.2.17) + actionpack (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) builder (~> 3.2) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -22,31 +22,31 @@ PATH rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.17) - activesupport (= 3.2.17) + activemodel (3.2.19) + activesupport (= 3.2.19) builder (~> 3.2) - activerecord (3.2.17) - activemodel (= 3.2.17) - activesupport (= 3.2.17) + activerecord (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.17) - activemodel (= 3.2.17) - activesupport (= 3.2.17) - activesupport (3.2.17) + activeresource (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + activesupport (3.2.19) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - rails (3.2.17) - actionmailer (= 3.2.17) - actionpack (= 3.2.17) - activerecord (= 3.2.17) - activeresource (= 3.2.17) - activesupport (= 3.2.17) + rails (3.2.19) + actionmailer (= 3.2.19) + actionpack (= 3.2.19) + activerecord (= 3.2.19) + activeresource (= 3.2.19) + activesupport (= 3.2.19) bundler (~> 1.0) - railties (= 3.2.17) - railties (3.2.17) - actionpack (= 3.2.17) - activesupport (= 3.2.17) + railties (= 3.2.19) + railties (3.2.19) + actionpack (= 3.2.19) + activesupport (= 3.2.19) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -63,7 +63,7 @@ GEM erubis (2.7.0) execjs (2.0.2) hike (1.2.3) - i18n (0.6.9) + i18n (0.6.11) journey (1.0.4) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) @@ -75,14 +75,14 @@ GEM memcache-client (1.8.5) metaclass (0.0.4) mime-types (1.25.1) - mocha (1.0.0) + mocha (0.14.0) metaclass (~> 0.0.1) - multi_json (1.9.2) + multi_json (1.10.1) mysql (2.9.1) mysql2 (0.3.15) nokogiri (1.5.11) pg (0.17.1) - polyglot (0.3.4) + polyglot (0.3.5) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) @@ -104,7 +104,7 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.39) + tzinfo (0.3.41) uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) @@ -121,10 +121,11 @@ DEPENDENCIES arel bcrypt-ruby (~> 3.0.0) benchmark-ips + execjs (< 2.1.0) journey jquery-rails memcache-client (>= 1.8.5) - mocha (>= 0.13.0) + mocha (~> 0.14) mysql (>= 2.8.1) mysql2 (>= 0.3.10) nokogiri (>= 1.4.5, < 1.6) diff --git a/vendor/cache/i18n-0.6.11.gem b/vendor/cache/i18n-0.6.11.gem new file mode 100644 index 0000000000..962a8d7ba1 Binary files /dev/null and b/vendor/cache/i18n-0.6.11.gem differ diff --git a/vendor/cache/i18n-0.6.9.gem b/vendor/cache/i18n-0.6.9.gem deleted file mode 100644 index 5e0cc04e30..0000000000 Binary files a/vendor/cache/i18n-0.6.9.gem and /dev/null differ diff --git a/vendor/cache/mocha-0.14.0.gem b/vendor/cache/mocha-0.14.0.gem new file mode 100644 index 0000000000..08f06c47f3 Binary files /dev/null and b/vendor/cache/mocha-0.14.0.gem differ diff --git a/vendor/cache/mocha-1.0.0.gem b/vendor/cache/mocha-1.0.0.gem deleted file mode 100644 index fecb25aaa5..0000000000 Binary files a/vendor/cache/mocha-1.0.0.gem and /dev/null differ diff --git a/vendor/cache/multi_json-1.10.1.gem b/vendor/cache/multi_json-1.10.1.gem new file mode 100644 index 0000000000..7647b55404 Binary files /dev/null and b/vendor/cache/multi_json-1.10.1.gem differ diff --git a/vendor/cache/multi_json-1.9.2.gem b/vendor/cache/multi_json-1.9.2.gem deleted file mode 100644 index 8d55f1bf86..0000000000 Binary files a/vendor/cache/multi_json-1.9.2.gem and /dev/null differ diff --git a/vendor/cache/polyglot-0.3.4.gem b/vendor/cache/polyglot-0.3.4.gem deleted file mode 100644 index 21e7fa61f7..0000000000 Binary files a/vendor/cache/polyglot-0.3.4.gem and /dev/null differ diff --git a/vendor/cache/polyglot-0.3.5.gem b/vendor/cache/polyglot-0.3.5.gem new file mode 100644 index 0000000000..5e43bae976 Binary files /dev/null and b/vendor/cache/polyglot-0.3.5.gem differ diff --git a/vendor/cache/tzinfo-0.3.39.gem b/vendor/cache/tzinfo-0.3.39.gem deleted file mode 100644 index ed4afcd6bd..0000000000 Binary files a/vendor/cache/tzinfo-0.3.39.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-0.3.41.gem b/vendor/cache/tzinfo-0.3.41.gem new file mode 100644 index 0000000000..e1ef0d5dd0 Binary files /dev/null and b/vendor/cache/tzinfo-0.3.41.gem differ