From f97b143839fdc71af03fe1bd892d8ea189cb886e Mon Sep 17 00:00:00 2001
From: manxingxing <manxingxing@gmail.com>
Date: Fri, 6 Dec 2013 17:35:12 +0800
Subject: [PATCH] update rails to 3.2.16

---
 Gemfile            |  2 +-
 Gemfile.lock       | 56 +++++++++++++++++++++++-----------------------
 app/models/user.rb |  2 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Gemfile b/Gemfile
index 380d664a..d18240e5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails'
+gem 'rails', "3.2.16"
 gem 'pg'
 gem 'haml'
 gem 'authlogic'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3da0c5cc..d5150c70 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     acl9 (0.12.0)
-    actionmailer (3.2.15)
-      actionpack (= 3.2.15)
+    actionmailer (3.2.16)
+      actionpack (= 3.2.16)
       mail (~> 2.5.4)
-    actionpack (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
+    actionpack (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -15,25 +15,25 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.15)
-      activesupport (= 3.2.15)
+    activemodel (3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
-    activerecord (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
+    activerecord (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-import (0.4.1)
       activerecord (>= 3.0)
-    activeresource (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
-    activesupport (3.2.15)
+    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)
     acts-as-taggable-on (2.4.1)
       rails (>= 3, < 5)
-    arel (3.0.2)
+    arel (3.0.3)
     authlogic (3.2.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -87,7 +87,7 @@ GEM
     haml (3.1.7)
     hike (1.2.3)
     hpricot (0.8.6)
-    i18n (0.6.5)
+    i18n (0.6.9)
     journey (1.0.4)
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
@@ -103,7 +103,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.1)
-    mime-types (1.25)
+    mime-types (1.25.1)
     multi_json (1.8.2)
     paperclip (3.5.2)
       activemodel (>= 3.0.0)
@@ -126,17 +126,17 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.15)
-      actionmailer (= 3.2.15)
-      actionpack (= 3.2.15)
-      activerecord (= 3.2.15)
-      activeresource (= 3.2.15)
-      activesupport (= 3.2.15)
+    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.15)
-    railties (3.2.15)
-      actionpack (= 3.2.15)
-      activesupport (= 3.2.15)
+      railties (= 3.2.16)
+    railties (3.2.16)
+      actionpack (= 3.2.16)
+      activesupport (= 3.2.16)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -214,7 +214,7 @@ DEPENDENCIES
   paperclip (~> 3.5.2)
   pg
   pg_search
-  rails
+  rails (= 3.2.16)
   rb-inotify
   ruby_parser (>= 3.1.2)
   sass-rails (~> 3.2.3)
diff --git a/app/models/user.rb b/app/models/user.rb
index e033e7df..e9fa2f03 100755
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -50,7 +50,7 @@ def to_s
   alias to_label to_s
 
   def to_param
-    "#{id}-#{full_name.parameterize}"
+    "#{id}-#{full_name}".parameterize
   end
 
   def full_name