修正 Rails 4.2 Devise 某些功能兼容问题，导致设置界面的删除帐号功能无法使用的问题;

Author: huacnlee

Gemfile

@@ -33,7 +33,7 @@ gem 'mongoid_auto_increment_id', '0.6.4'
 gem 'mongoid_rails_migrations', '1.0.0'
 
 # 用户系统 
-gem 'devise', github: "plataformatec/devise", branch: "lm-rails-4-2"
+gem 'devise', '~> 3.4.0'
 gem 'devise-encryptable', '0.1.2'
 
 # 分页

Gemfile.lock

@@ -1,16 +1,3 @@
-GIT
-  remote: git://github.com/plataformatec/devise.git
-  revision: ee69d41fc1707c5b7b2630034dc1d120b6200f56
-  branch: lm-rails-4-2
-  specs:
-    devise (3.3.0)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      responders
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
-
 GEM
   remote: https://ruby.taobao.org/
   specs:
@@ -69,7 +56,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bcrypt (3.1.7)
+    bcrypt (3.1.9)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     bootstrap-will_paginate (0.0.3)
@@ -120,6 +107,13 @@ GEM
     database_cleaner (1.3.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
+    devise (3.4.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      responders
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
     devise-encryptable (0.1.2)
       devise (>= 2.1.0)
     diff-lcs (1.2.5)
@@ -327,7 +321,7 @@ GEM
     redis-objects (0.9.1)
       redis (>= 3.0.2)
     remotipart (1.2.1)
-    responders (2.0.0)
+    responders (2.0.1)
       railties (>= 4.2.0.alpha, < 5)
     rest-client (1.7.2)
       mime-types (>= 1.16, < 3.0)
@@ -431,7 +425,7 @@ DEPENDENCIES
   coffee-rails (~> 4.0.0)
   dalli (= 2.7.1)
   database_cleaner
-  devise!
+  devise (~> 3.4.0)
   devise-encryptable (= 0.1.2)
   eventmachine (= 1.0.3)
   exception_notification

app/controllers/account_controller.rb

@@ -39,7 +39,8 @@ def destroy
 
     if current_user.valid_password?(current_password)
       resource.soft_delete
-      sign_out_and_redirect(root_path)
+      sign_out
+      redirect_to root_path
       set_flash_message :notice, :destroyed
     else
       current_user.errors.add(:current_password, :invalid)