diff options
| author | pluralcafe-docker <git@plural.cafe> | 2019-01-12 04:24:01 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2019-01-12 04:24:01 +0000 |
| commit | a6e0ff72f552dc172c18f5a10bbca071b067ab51 (patch) | |
| tree | f845d5a7e328c3babfde43066325262c1dbdbed0 /config/settings.yml | |
| parent | 74134e490c49d8a7d88cc69720e22cd88cee9233 (diff) | |
| parent | 2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'config/settings.yml')
| -rw-r--r-- | config/settings.yml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/config/settings.yml b/config/settings.yml index bd6578bd4..4f070240a 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -1,11 +1,6 @@ -# config/app.yml for rails-settings-cached -# -# 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 -# +# This file contains default values, and does not need to be edited. All +# important settings can be changed from the admin interface. + defaults: &defaults site_title: 'dev.glitch.social' site_short_description: '' @@ -57,11 +52,14 @@ defaults: &defaults - root - webmaster - administrator + - mod + - moderator disallowed_hashtags: # space separated string or list of hashtags without the hash bootstrap_timeline_accounts: '' activity_api_enabled: true peers_api_enabled: true show_known_fediverse_at_about_page: true + development: <<: *defaults |