nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add mod and moderator to list of default reserved usernames (#9713)

This commit is contained in:
Eugen Rochko 2019-01-04 12:29:39 +01:00 committed by GitHub
parent 664bb7bb72
commit acae118120
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/settings.yml
View File

@ -1,11 +1,6 @@
# config/app.yml for rails-settings-cached # This file contains default values, and does not need to be edited. All
# # important settings can be changed from the admin interface.
# This file contains default values, and does not need to be edited
# when configuring an instance. These settings may be changed by an
# Administrator using the Web UI.
#
# For more information, see docs/Running-Mastodon/Administration-guide.md
#
defaults: &defaults defaults: &defaults
site_title: Mastodon site_title: Mastodon
site_short_description: '' site_short_description: ''
@ -54,11 +49,14 @@ defaults: &defaults
- root - root
- webmaster - webmaster
- administrator - administrator
- mod
- moderator
disallowed_hashtags: # space separated string or list of hashtags without the hash disallowed_hashtags: # space separated string or list of hashtags without the hash
bootstrap_timeline_accounts: '' bootstrap_timeline_accounts: ''
activity_api_enabled: true activity_api_enabled: true
peers_api_enabled: true peers_api_enabled: true
show_known_fediverse_at_about_page: true show_known_fediverse_at_about_page: true
development: development:
<<: *defaults <<: *defaults