diff --git a/Gemfile b/Gemfile index a559688c..ce79d514 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '= 3.2.13' +gem 'rails', '= 3.2.16' #gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3' gem 'mysql2', '>= 0.3.11' diff --git a/Gemfile.lock b/Gemfile.lock index 4eb0ead2..8e2f1670 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,12 +75,12 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + 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) journey (~> 1.0.4) @@ -88,26 +88,26 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) + activemodel (3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + 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) addressable (2.3.5) airbrake (3.1.8) activesupport builder json - arel (3.0.2) + arel (3.0.3) bcrypt-ruby (3.0.1) builder (3.0.4) carrierwave (0.8.0) @@ -155,17 +155,16 @@ GEM fssm (0.2.10) haml (4.0.0) tilt - hike (1.2.1) + hike (1.2.3) http_parser.rb (0.5.3) - i18n (0.6.1) + i18n (0.6.8) journey (1.0.4) json (1.7.7) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) memcache-client (1.8.5) - mime-types (1.21) + mime-types (1.25.1) mini_magick (3.5.0) subexec (~> 0.2.1) msgpack (0.5.3) @@ -202,24 +201,24 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) + 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.2.13) + railties (= 3.2.16) rails-i18n (0.7.2) i18n (~> 0.5) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + 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, < 2.0) - rake (10.0.3) + rake (10.1.0) rdiscount (1.6.8) rdoc (3.12.2) json (~> 1.4) @@ -276,12 +275,12 @@ GEM tilt (~> 1.1, != 1.3.0) subexec (0.2.2) swf_converter (0.0.3) - thor (0.17.0) - tilt (1.3.6) - treetop (1.4.12) + thor (0.18.1) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) + tzinfo (0.3.38) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -331,7 +330,7 @@ DEPENDENCIES patron (~> 0.4.18) rack-attack (~> 2.2.0) rack-fiber_pool - rails (= 3.2.13) + rails (= 3.2.16) rails-i18n rdiscount (~> 1.6.5) resque (~> 1.23.0) diff --git a/vendor/cache/actionmailer-3.2.13.gem b/vendor/cache/actionmailer-3.2.13.gem deleted file mode 100644 index 1433db58..00000000 Binary files a/vendor/cache/actionmailer-3.2.13.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-3.2.16.gem b/vendor/cache/actionmailer-3.2.16.gem new file mode 100644 index 00000000..d9d269ff Binary files /dev/null and b/vendor/cache/actionmailer-3.2.16.gem differ diff --git a/vendor/cache/actionpack-3.2.13.gem b/vendor/cache/actionpack-3.2.13.gem deleted file mode 100644 index 8eb00af0..00000000 Binary files a/vendor/cache/actionpack-3.2.13.gem and /dev/null differ diff --git a/vendor/cache/actionpack-3.2.16.gem b/vendor/cache/actionpack-3.2.16.gem new file mode 100644 index 00000000..a34b01d1 Binary files /dev/null and b/vendor/cache/actionpack-3.2.16.gem differ diff --git a/vendor/cache/activemodel-3.2.13.gem b/vendor/cache/activemodel-3.2.13.gem deleted file mode 100644 index a6bd09db..00000000 Binary files a/vendor/cache/activemodel-3.2.13.gem and /dev/null differ diff --git a/vendor/cache/activemodel-3.2.16.gem b/vendor/cache/activemodel-3.2.16.gem new file mode 100644 index 00000000..672b81f5 Binary files /dev/null and b/vendor/cache/activemodel-3.2.16.gem differ diff --git a/vendor/cache/activerecord-3.2.13.gem b/vendor/cache/activerecord-3.2.13.gem deleted file mode 100644 index bdc00435..00000000 Binary files a/vendor/cache/activerecord-3.2.13.gem and /dev/null differ diff --git a/vendor/cache/activerecord-3.2.16.gem b/vendor/cache/activerecord-3.2.16.gem new file mode 100644 index 00000000..1d8432e1 Binary files /dev/null and b/vendor/cache/activerecord-3.2.16.gem differ diff --git a/vendor/cache/activeresource-3.2.13.gem b/vendor/cache/activeresource-3.2.13.gem deleted file mode 100644 index 4e3f53b2..00000000 Binary files a/vendor/cache/activeresource-3.2.13.gem and /dev/null differ diff --git a/vendor/cache/activeresource-3.2.16.gem b/vendor/cache/activeresource-3.2.16.gem new file mode 100644 index 00000000..13f438aa Binary files /dev/null and b/vendor/cache/activeresource-3.2.16.gem differ diff --git a/vendor/cache/activesupport-3.2.13.gem b/vendor/cache/activesupport-3.2.13.gem deleted file mode 100644 index 16fe8d1e..00000000 Binary files a/vendor/cache/activesupport-3.2.13.gem and /dev/null differ diff --git a/vendor/cache/activesupport-3.2.16.gem b/vendor/cache/activesupport-3.2.16.gem new file mode 100644 index 00000000..b013e88f Binary files /dev/null and b/vendor/cache/activesupport-3.2.16.gem differ diff --git a/vendor/cache/arel-3.0.2.gem b/vendor/cache/arel-3.0.2.gem deleted file mode 100644 index 33054428..00000000 Binary files a/vendor/cache/arel-3.0.2.gem and /dev/null differ diff --git a/vendor/cache/arel-3.0.3.gem b/vendor/cache/arel-3.0.3.gem new file mode 100644 index 00000000..d113b777 Binary files /dev/null and b/vendor/cache/arel-3.0.3.gem differ diff --git a/vendor/cache/hike-1.2.1.gem b/vendor/cache/hike-1.2.1.gem deleted file mode 100644 index 9bf7631d..00000000 Binary files a/vendor/cache/hike-1.2.1.gem and /dev/null differ diff --git a/vendor/cache/hike-1.2.3.gem b/vendor/cache/hike-1.2.3.gem new file mode 100644 index 00000000..3dd8fe7a Binary files /dev/null and b/vendor/cache/hike-1.2.3.gem differ diff --git a/vendor/cache/i18n-0.6.1.gem b/vendor/cache/i18n-0.6.1.gem deleted file mode 100644 index 89a7e535..00000000 Binary files a/vendor/cache/i18n-0.6.1.gem and /dev/null differ diff --git a/vendor/cache/i18n-0.6.8.gem b/vendor/cache/i18n-0.6.8.gem new file mode 100644 index 00000000..18f1c05b Binary files /dev/null and b/vendor/cache/i18n-0.6.8.gem differ diff --git a/vendor/cache/mail-2.5.3.gem b/vendor/cache/mail-2.5.3.gem deleted file mode 100644 index eda4e317..00000000 Binary files a/vendor/cache/mail-2.5.3.gem and /dev/null differ diff --git a/vendor/cache/mail-2.5.4.gem b/vendor/cache/mail-2.5.4.gem new file mode 100644 index 00000000..bc7eea2d Binary files /dev/null and b/vendor/cache/mail-2.5.4.gem differ diff --git a/vendor/cache/mime-types-1.21.gem b/vendor/cache/mime-types-1.21.gem deleted file mode 100644 index 0bfdbe69..00000000 Binary files a/vendor/cache/mime-types-1.21.gem and /dev/null differ diff --git a/vendor/cache/mime-types-1.25.1.gem b/vendor/cache/mime-types-1.25.1.gem new file mode 100644 index 00000000..877d8a97 Binary files /dev/null and b/vendor/cache/mime-types-1.25.1.gem differ diff --git a/vendor/cache/rails-3.2.13.gem b/vendor/cache/rails-3.2.16.gem similarity index 59% rename from vendor/cache/rails-3.2.13.gem rename to vendor/cache/rails-3.2.16.gem index 2e15c814..751b63cd 100644 Binary files a/vendor/cache/rails-3.2.13.gem and b/vendor/cache/rails-3.2.16.gem differ diff --git a/vendor/cache/railties-3.2.13.gem b/vendor/cache/railties-3.2.13.gem deleted file mode 100644 index d2ecfd67..00000000 Binary files a/vendor/cache/railties-3.2.13.gem and /dev/null differ diff --git a/vendor/cache/railties-3.2.16.gem b/vendor/cache/railties-3.2.16.gem new file mode 100644 index 00000000..a56d976f Binary files /dev/null and b/vendor/cache/railties-3.2.16.gem differ diff --git a/vendor/cache/rake-10.0.3.gem b/vendor/cache/rake-10.0.3.gem deleted file mode 100644 index f645fa9f..00000000 Binary files a/vendor/cache/rake-10.0.3.gem and /dev/null differ diff --git a/vendor/cache/rake-10.1.0.gem b/vendor/cache/rake-10.1.0.gem new file mode 100644 index 00000000..5402cd63 Binary files /dev/null and b/vendor/cache/rake-10.1.0.gem differ diff --git a/vendor/cache/thor-0.17.0.gem b/vendor/cache/thor-0.17.0.gem deleted file mode 100644 index 6dff5619..00000000 Binary files a/vendor/cache/thor-0.17.0.gem and /dev/null differ diff --git a/vendor/cache/thor-0.18.1.gem b/vendor/cache/thor-0.18.1.gem new file mode 100644 index 00000000..9fd0308f Binary files /dev/null and b/vendor/cache/thor-0.18.1.gem differ diff --git a/vendor/cache/tilt-1.3.6.gem b/vendor/cache/tilt-1.3.6.gem deleted file mode 100644 index 0fabd6c6..00000000 Binary files a/vendor/cache/tilt-1.3.6.gem and /dev/null differ diff --git a/vendor/cache/tilt-1.4.1.gem b/vendor/cache/tilt-1.4.1.gem new file mode 100644 index 00000000..3ad79a9b Binary files /dev/null and b/vendor/cache/tilt-1.4.1.gem differ diff --git a/vendor/cache/treetop-1.4.12.gem b/vendor/cache/treetop-1.4.12.gem deleted file mode 100644 index 44a88b55..00000000 Binary files a/vendor/cache/treetop-1.4.12.gem and /dev/null differ diff --git a/vendor/cache/treetop-1.4.15.gem b/vendor/cache/treetop-1.4.15.gem new file mode 100644 index 00000000..0a621ef3 Binary files /dev/null and b/vendor/cache/treetop-1.4.15.gem differ diff --git a/vendor/cache/tzinfo-0.3.37.gem b/vendor/cache/tzinfo-0.3.37.gem deleted file mode 100644 index 59a140a1..00000000 Binary files a/vendor/cache/tzinfo-0.3.37.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-0.3.38.gem b/vendor/cache/tzinfo-0.3.38.gem new file mode 100644 index 00000000..9b7672bb Binary files /dev/null and b/vendor/cache/tzinfo-0.3.38.gem differ