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

FIX: Quiet server side errors for requesting json for account-created

This commit is contained in:
Robin Ward 2017-05-04 12:30:13 -04:00
parent b3165f8435
commit 57a2042ef6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/users_controller.rb
View File

@ -548,7 +548,11 @@ class UsersController < ApplicationController
store_preloaded("accountCreated", MultiJson.dump(@account_created)) store_preloaded("accountCreated", MultiJson.dump(@account_created))
expires_now expires_now
render "default/empty"
respond_to do |format|
format.html { render "default/empty" }
format.json { render json: success_json }
end
end end
def activate_account def activate_account

2
config/site_settings.yml
View File

@ -340,7 +340,7 @@ users:
max: 60 max: 60
reserved_usernames: reserved_usernames:
type: list type: list
default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support" default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support|account-created"
min_password_length: min_password_length:
client: true client: true
default: 10 default: 10