221580a3af
Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.
95 lines
2.3 KiB
YAML
95 lines
2.3 KiB
YAML
# 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: 'Mastodon Glitch Edition'
|
|
site_short_description: ''
|
|
site_description: ''
|
|
site_extended_description: ''
|
|
site_terms: ''
|
|
site_contact_username: ''
|
|
site_contact_email: ''
|
|
registrations_mode: 'open'
|
|
profile_directory: true
|
|
closed_registrations_message: ''
|
|
open_deletion: true
|
|
timeline_preview: false
|
|
min_invite_role: 'admin'
|
|
show_staff_badge: true
|
|
default_sensitive: false
|
|
unfollow_modal: false
|
|
boost_modal: false
|
|
favourite_modal: false
|
|
delete_modal: true
|
|
auto_play_gif: false
|
|
display_media: 'default'
|
|
expand_spoilers: false
|
|
preview_sensitive_media: false
|
|
reduce_motion: false
|
|
disable_swiping: false
|
|
show_application: false
|
|
system_font_ui: false
|
|
system_emoji_font: false
|
|
noindex: false
|
|
hide_followers_count: false
|
|
flavour: 'glitch'
|
|
skin: 'default'
|
|
aggregate_reblogs: true
|
|
advanced_layout: false
|
|
use_blurhash: true
|
|
use_pending_items: false
|
|
trends: true
|
|
trendable_by_default: false
|
|
trending_status_cw: true
|
|
crop_images: true
|
|
notification_emails:
|
|
follow: true
|
|
reblog: false
|
|
favourite: false
|
|
mention: true
|
|
follow_request: true
|
|
digest: true
|
|
report: true
|
|
pending_account: true
|
|
trending_tag: true
|
|
trending_link: false
|
|
trending_status: false
|
|
appeal: true
|
|
always_send_emails: false
|
|
interactions:
|
|
must_be_follower: false
|
|
must_be_following: false
|
|
must_be_following_dm: false
|
|
reserved_usernames:
|
|
- admin
|
|
- support
|
|
- help
|
|
- 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
|
|
show_reblogs_in_public_timelines: false
|
|
show_replies_in_public_timelines: false
|
|
default_content_type: 'text/plain'
|
|
show_domain_blocks: 'disabled'
|
|
show_domain_blocks_rationale: 'disabled'
|
|
outgoing_spoilers: ''
|
|
require_invite_text: false
|
|
captcha_enabled: false
|
|
backups_retention_period: 7
|
|
|
|
development:
|
|
<<: *defaults
|
|
|
|
test:
|
|
<<: *defaults
|
|
|
|
production:
|
|
<<: *defaults
|