Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream

This commit is contained in:
Claire committed 2026-04-11 13:22:19 +02:00
commit 1eac058989
174 files changed
+1677 -860

No files matched your search

+6
View File
@@ -27,6 +27,12 @@ namespace :mastodon do
q.messages[:valid?] = 'Invalid domain. If you intend to use unicode characters, enter punycode here'
end
if env['LOCAL_DOMAIN'].include?('mastodon') || env['LOCAL_DOMAIN'].include?('mstdn')
prompt.warn 'The Mastodon name is a trademark and its use is restricted.'
prompt.warn 'You can read the trademark policy at https://joinmastodon.org/trademark'
next prompt.warn 'Nothing saved. Bye!' if prompt.no?('Continue anyway?')
end
prompt.say "\n"
prompt.say('Single user mode disables registrations and redirects the landing page to your public profile.')