diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-05 01:03:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 01:03:45 +0200 |
| commit | f7a30e2fae3199a82e2ad23bb9d761d1fe1be8de (patch) | |
| tree | 5934d035c66396fd0f5cbca17baec19a9440de13 /config | |
| parent | 3f815b2052f0528bd84fa2c856c69985876561eb (diff) | |
Added support for configurable reserved usernames (fix of #1382) (#3566)
* Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/settings.yml | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 2ff2f7eec..965bfbe47 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,6 +40,7 @@ en: posts: Posts remote_follow: Remote follow unfollow: Unfollow + reserved_username: The username is reserved activitypub: activity: announce: diff --git a/config/settings.yml b/config/settings.yml index 4811213cb..bffb7052a 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -7,7 +7,7 @@ # For more information, see docs/Running-Mastodon/Administration-guide.md # defaults: &defaults - site_title: 'Mastodon' + site_title: Mastodon site_description: '' site_extended_description: '' site_contact_username: '' @@ -27,6 +27,13 @@ defaults: &defaults interactions: must_be_follower: false must_be_following: false + reserved_usernames: + - admin + - support + - help + - root + - webmaster + - administrator development: <<: *defaults |