Merge pull request #2544 from riking/activation

Don't redirect to login when activating account...
2014-07-15 13:53:26 -04:00 · 2014-07-15 13:53:26 -04:00 · 844edb31e7
parent 18661fac79 915f60b0fc
commit 844edb31e7
1 changed files with 2 additions and 1 deletions
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -18,6 +18,7 @@ class UsersController < ApplicationController
                                                            :create,
                                                            :get_honeypot_value,
                                                            :activate_account,
+                                                            :perform_account_activation,
                                                            :send_activation_email,
                                                            :authorize_email,
                                                            :password_reset]
@ -277,7 +278,7 @@ class UsersController < ApplicationController
  end

  def activate_account
-    expires_now()
+    expires_now
    render layout: 'no_js'
  end