mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-12 18:03:03 +00:00
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
This commit is contained in:
commit
db3be77890
|
@ -39,7 +39,7 @@ export function importFetchedAccounts(accounts) {
|
||||||
pushUnique(normalAccounts, normalizeAccount(account));
|
pushUnique(normalAccounts, normalizeAccount(account));
|
||||||
|
|
||||||
if (account.moved) {
|
if (account.moved) {
|
||||||
processAccount(account);
|
processAccount(account.moved);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,10 @@ export function normalizeAccount(account) {
|
||||||
account.display_name_html = emojify(escapeTextContentForBrowser(displayName));
|
account.display_name_html = emojify(escapeTextContentForBrowser(displayName));
|
||||||
account.note_emojified = emojify(account.note);
|
account.note_emojified = emojify(account.note);
|
||||||
|
|
||||||
|
if (account.moved) {
|
||||||
|
account.moved = account.moved.id;
|
||||||
|
}
|
||||||
|
|
||||||
return account;
|
return account;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,10 @@
|
||||||
"description": "The secret key base",
|
"description": "The secret key base",
|
||||||
"generator": "secret"
|
"generator": "secret"
|
||||||
},
|
},
|
||||||
|
"OTP_SECRET": {
|
||||||
|
"description": "One-time password secret",
|
||||||
|
"generator": "secret"
|
||||||
|
},
|
||||||
"SINGLE_USER_MODE": {
|
"SINGLE_USER_MODE": {
|
||||||
"description": "Should the instance run in single user mode? (Disable registrations, redirect to front page)",
|
"description": "Should the instance run in single user mode? (Disable registrations, redirect to front page)",
|
||||||
"value": "false",
|
"value": "false",
|
||||||
|
|
Loading…
Reference in a new issue