Update rails to version 3.2.11

ZenCocoon · Jan 10, 2013 · 42c73ef · 42c73ef
1 parent 0eb0982
commit 42c73ef
Show file tree

Hide file tree

Showing 48 changed files with 39 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.8'
+gem 'rails', '3.2.11'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,35 +9,35 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -53,20 +53,20 @@ GEM
     hashie (1.2.0)
     hike (1.2.1)
     httpauth (0.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.4)
+    json (1.7.6)
     jwt (0.1.4)
       json (>= 1.2.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.3.6)
+    multi_json (1.5.0)
     multipart-post (1.1.5)
     oauth2 (0.8.0)
       faraday (~> 0.8)
@@ -82,46 +82,47 @@ GEM
       omniauth (~> 1.0)
     pg (0.14.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.3)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     sass (3.1.20)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.15.4)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
     uglifier (1.2.6)
       execjs (>= 0.3.0)
       multi_json (~> 1.3)
@@ -134,6 +135,6 @@ DEPENDENCIES
   jquery-rails
   omniauth-testoauth2strategy!
   pg
-  rails (= 3.2.8)
+  rails (= 3.2.11)
   sass-rails
   uglifier
diff --git a/README.md b/README.md
diff --git a/Rakefile b/Rakefile
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
diff --git a/app/mailers/.gitkeep b/app/mailers/.gitkeep
diff --git a/app/models/.gitkeep b/app/models/.gitkeep
diff --git a/app/models/user.rb b/app/models/user.rb
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
diff --git a/config.ru b/config.ru
diff --git a/config/application.rb b/config/application.rb
diff --git a/config/boot.rb b/config/boot.rb
diff --git a/config/database.yml b/config/database.yml
diff --git a/config/environment.rb b/config/environment.rb
diff --git a/config/environments/development.rb b/config/environments/development.rb
diff --git a/config/environments/production.rb b/config/environments/production.rb
diff --git a/config/environments/test.rb b/config/environments/test.rb
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
diff --git a/config/locales/en.yml b/config/locales/en.yml
diff --git a/config/routes.rb b/config/routes.rb
diff --git a/db/migrate/20111016145923_create_users.rb b/db/migrate/20111016145923_create_users.rb
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/db/seeds.rb b/db/seeds.rb
diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
diff --git a/lib/assets/.gitkeep b/lib/assets/.gitkeep
diff --git a/lib/tasks/.gitkeep b/lib/tasks/.gitkeep
diff --git a/log/.gitkeep b/log/.gitkeep
diff --git a/public/404.html b/public/404.html
diff --git a/public/422.html b/public/422.html
diff --git a/public/500.html b/public/500.html
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/vendor/assets/stylesheets/.gitkeep b/vendor/assets/stylesheets/.gitkeep
diff --git a/vendor/plugins/.gitkeep b/vendor/plugins/.gitkeep