Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2544 from riking/activation 

Don't redirect to login when activating account...
This commit is contained in:
Robin Ward 2014-07-15 13:53:26 -04:00
parent 18661fac79 915f60b0fc
commit 844edb31e7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/users_controller.rb
View File

@ -18,6 +18,7 @@ class UsersController < ApplicationController
:create, :create,
:get_honeypot_value, :get_honeypot_value,
:activate_account, :activate_account,
:perform_account_activation,
:send_activation_email, :send_activation_email,
:authorize_email, :authorize_email,
:password_reset] :password_reset]
@ -277,7 +278,7 @@ class UsersController < ApplicationController
end end
def activate_account def activate_account
expires_now() expires_now
render layout: 'no_js' render layout: 'no_js'
end end