diff --git a/Gemfile b/Gemfile index 4f80ef9f..bcf73f31 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'http://rubygems.org' gem 'dotenv-rails' gem 'dotenv-deployment' -gem 'rails', '= 3.2.18' +gem 'rails', '= 3.2.22.5' #gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3' gem 'mysql2', '>= 0.3.11' diff --git a/Gemfile.lock b/Gemfile.lock index e3661cce..d87251a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,12 +46,12 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.18) - actionpack (= 3.2.18) + actionmailer (3.2.22.5) + actionpack (= 3.2.22.5) mail (~> 2.5.4) - actionpack (3.2.18) - activemodel (= 3.2.18) - activesupport (= 3.2.18) + actionpack (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -59,18 +59,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.18) - activesupport (= 3.2.18) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) - activerecord (3.2.18) - activemodel (= 3.2.18) - activesupport (= 3.2.18) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.18) - activemodel (= 3.2.18) - activesupport (= 3.2.18) - activesupport (3.2.18) + activeresource (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + activesupport (3.2.22.5) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.8) @@ -100,6 +100,7 @@ GEM sass (~> 3.2.19) compass-rails (1.0.3) compass (>= 0.12.2, < 0.14) + concurrent-ruby (1.1.9) devise (2.2.8) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -135,14 +136,15 @@ GEM tilt highline (1.7.2) hike (1.2.3) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - json (1.8.3) + json (1.8.6) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) launchy (~> 2.2) - mail (2.5.4) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) memcache-client (1.8.5) @@ -178,7 +180,7 @@ GEM rack (1.4.7) rack-attack (2.2.1) rack - rack-cache (1.2) + rack-cache (1.7.1) rack (>= 0.4) rack-protection (1.5.3) rack @@ -186,25 +188,25 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (3.2.18) - actionmailer (= 3.2.18) - actionpack (= 3.2.18) - activerecord (= 3.2.18) - activeresource (= 3.2.18) - activesupport (= 3.2.18) + rails (3.2.22.5) + actionmailer (= 3.2.22.5) + actionpack (= 3.2.22.5) + activerecord (= 3.2.22.5) + activeresource (= 3.2.22.5) + activesupport (= 3.2.22.5) bundler (~> 1.0) - railties (= 3.2.18) + railties (= 3.2.22.5) rails-i18n (3.0.1) i18n (~> 0.5) rails (>= 3.0.0, < 4.0.0) - railties (3.2.18) - actionpack (= 3.2.18) - activesupport (= 3.2.18) + railties (3.2.22.5) + actionpack (= 3.2.22.5) + activesupport (= 3.2.22.5) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.4.2) + rake (12.2.1) rdiscount (1.6.8) rdoc (3.12.2) json (~> 1.4) @@ -267,12 +269,12 @@ GEM tilt (~> 1.1, != 1.3.0) subexec (0.2.3) swf_converter (0.0.3) - thor (0.19.1) + thor (0.20.3) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.44) + tzinfo (0.3.62) uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) @@ -320,7 +322,7 @@ DEPENDENCIES passenger_monit (~> 0.1.1) patron (~> 0.4.18) rack-attack (~> 2.2.0) - rails (= 3.2.18) + rails (= 3.2.22.5) rails-i18n rdiscount (~> 1.6.5) react-rails (~> 0.8.0.0) diff --git a/vendor/cache/actionmailer-3.2.18.gem b/vendor/cache/actionmailer-3.2.18.gem deleted file mode 100644 index 339e32a9..00000000 Binary files a/vendor/cache/actionmailer-3.2.18.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-3.2.22.5.gem b/vendor/cache/actionmailer-3.2.22.5.gem new file mode 100644 index 00000000..a3497705 Binary files /dev/null and b/vendor/cache/actionmailer-3.2.22.5.gem differ diff --git a/vendor/cache/actionpack-3.2.18.gem b/vendor/cache/actionpack-3.2.18.gem deleted file mode 100644 index 397385ee..00000000 Binary files a/vendor/cache/actionpack-3.2.18.gem and /dev/null differ diff --git a/vendor/cache/actionpack-3.2.22.5.gem b/vendor/cache/actionpack-3.2.22.5.gem new file mode 100644 index 00000000..dea2425e Binary files /dev/null and b/vendor/cache/actionpack-3.2.22.5.gem differ diff --git a/vendor/cache/activemodel-3.2.18.gem b/vendor/cache/activemodel-3.2.18.gem deleted file mode 100644 index 04e9c7a1..00000000 Binary files a/vendor/cache/activemodel-3.2.18.gem and /dev/null differ diff --git a/vendor/cache/activemodel-3.2.22.5.gem b/vendor/cache/activemodel-3.2.22.5.gem new file mode 100644 index 00000000..81f4972b Binary files /dev/null and b/vendor/cache/activemodel-3.2.22.5.gem differ diff --git a/vendor/cache/activerecord-3.2.18.gem b/vendor/cache/activerecord-3.2.18.gem deleted file mode 100644 index a825e451..00000000 Binary files a/vendor/cache/activerecord-3.2.18.gem and /dev/null differ diff --git a/vendor/cache/activerecord-3.2.22.5.gem b/vendor/cache/activerecord-3.2.22.5.gem new file mode 100644 index 00000000..6f475e05 Binary files /dev/null and b/vendor/cache/activerecord-3.2.22.5.gem differ diff --git a/vendor/cache/activeresource-3.2.18.gem b/vendor/cache/activeresource-3.2.18.gem deleted file mode 100644 index 6a8add15..00000000 Binary files a/vendor/cache/activeresource-3.2.18.gem and /dev/null differ diff --git a/vendor/cache/activeresource-3.2.22.5.gem b/vendor/cache/activeresource-3.2.22.5.gem new file mode 100644 index 00000000..72b9a3b4 Binary files /dev/null and b/vendor/cache/activeresource-3.2.22.5.gem differ diff --git a/vendor/cache/activesupport-3.2.18.gem b/vendor/cache/activesupport-3.2.18.gem deleted file mode 100644 index f3c96649..00000000 Binary files a/vendor/cache/activesupport-3.2.18.gem and /dev/null differ diff --git a/vendor/cache/activesupport-3.2.22.5.gem b/vendor/cache/activesupport-3.2.22.5.gem new file mode 100644 index 00000000..a84e5374 Binary files /dev/null and b/vendor/cache/activesupport-3.2.22.5.gem differ diff --git a/vendor/cache/concurrent-ruby-1.1.9.gem b/vendor/cache/concurrent-ruby-1.1.9.gem new file mode 100644 index 00000000..9ed64f26 Binary files /dev/null and b/vendor/cache/concurrent-ruby-1.1.9.gem differ diff --git a/vendor/cache/i18n-0.7.0.gem b/vendor/cache/i18n-0.7.0.gem deleted file mode 100644 index 6f8cf735..00000000 Binary files a/vendor/cache/i18n-0.7.0.gem and /dev/null differ diff --git a/vendor/cache/i18n-0.9.5.gem b/vendor/cache/i18n-0.9.5.gem new file mode 100644 index 00000000..4c638ca5 Binary files /dev/null and b/vendor/cache/i18n-0.9.5.gem differ diff --git a/vendor/cache/json-1.8.3.gem b/vendor/cache/json-1.8.3.gem deleted file mode 100644 index 6474a4fc..00000000 Binary files a/vendor/cache/json-1.8.3.gem and /dev/null differ diff --git a/vendor/cache/json-1.8.6.gem b/vendor/cache/json-1.8.6.gem new file mode 100644 index 00000000..2a7d6648 Binary files /dev/null and b/vendor/cache/json-1.8.6.gem differ diff --git a/vendor/cache/mail-2.5.4.gem b/vendor/cache/mail-2.5.4.gem deleted file mode 100644 index bc7eea2d..00000000 Binary files a/vendor/cache/mail-2.5.4.gem and /dev/null differ diff --git a/vendor/cache/mail-2.5.5.gem b/vendor/cache/mail-2.5.5.gem new file mode 100644 index 00000000..7d232085 Binary files /dev/null and b/vendor/cache/mail-2.5.5.gem differ diff --git a/vendor/cache/rack-cache-1.2.gem b/vendor/cache/rack-cache-1.2.gem deleted file mode 100644 index 05bcc0dd..00000000 Binary files a/vendor/cache/rack-cache-1.2.gem and /dev/null differ diff --git a/vendor/cache/rack-cache-1.7.1.gem b/vendor/cache/rack-cache-1.7.1.gem new file mode 100644 index 00000000..e051b1ea Binary files /dev/null and b/vendor/cache/rack-cache-1.7.1.gem differ diff --git a/vendor/cache/rails-3.2.18.gem b/vendor/cache/rails-3.2.18.gem deleted file mode 100644 index ed713d50..00000000 Binary files a/vendor/cache/rails-3.2.18.gem and /dev/null differ diff --git a/vendor/cache/rails-3.2.22.5.gem b/vendor/cache/rails-3.2.22.5.gem new file mode 100644 index 00000000..57f78030 Binary files /dev/null and b/vendor/cache/rails-3.2.22.5.gem differ diff --git a/vendor/cache/railties-3.2.18.gem b/vendor/cache/railties-3.2.18.gem deleted file mode 100644 index 656c91f4..00000000 Binary files a/vendor/cache/railties-3.2.18.gem and /dev/null differ diff --git a/vendor/cache/railties-3.2.22.5.gem b/vendor/cache/railties-3.2.22.5.gem new file mode 100644 index 00000000..6c4160a2 Binary files /dev/null and b/vendor/cache/railties-3.2.22.5.gem differ diff --git a/vendor/cache/rake-10.4.2.gem b/vendor/cache/rake-10.4.2.gem deleted file mode 100644 index 0bea3c01..00000000 Binary files a/vendor/cache/rake-10.4.2.gem and /dev/null differ diff --git a/vendor/cache/rake-12.2.1.gem b/vendor/cache/rake-12.2.1.gem new file mode 100644 index 00000000..d43b8807 Binary files /dev/null and b/vendor/cache/rake-12.2.1.gem differ diff --git a/vendor/cache/thor-0.19.1.gem b/vendor/cache/thor-0.19.1.gem deleted file mode 100644 index 1ca502f3..00000000 Binary files a/vendor/cache/thor-0.19.1.gem and /dev/null differ diff --git a/vendor/cache/thor-0.20.3.gem b/vendor/cache/thor-0.20.3.gem new file mode 100644 index 00000000..9a88db7b Binary files /dev/null and b/vendor/cache/thor-0.20.3.gem differ diff --git a/vendor/cache/tzinfo-0.3.44.gem b/vendor/cache/tzinfo-0.3.44.gem deleted file mode 100644 index 32b8c789..00000000 Binary files a/vendor/cache/tzinfo-0.3.44.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-0.3.62.gem b/vendor/cache/tzinfo-0.3.62.gem new file mode 100644 index 00000000..455c222c Binary files /dev/null and b/vendor/cache/tzinfo-0.3.62.gem differ