luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-23 23:33:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse source
This commit is contained in:
Jenkins 2018-03-26 11:17:19 +00:00
parent 837b3804bf 605a92b460
commit db3be77890
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/actions/importer/index.js
View file

@ -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);
} }
} }

4
app/javascript/mastodon/actions/importer/normalizer.js
View file

@ -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;
} }

4
scalingo.json
View file

@ -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",