mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 11:53:13 +00:00
01d6f7529f
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.
57 lines
1.4 KiB
YAML
57 lines
1.4 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: ''
|
|
timeline_preview: false
|
|
show_staff_badge: true
|
|
preview_sensitive_media: false
|
|
noindex: false
|
|
flavour: 'glitch'
|
|
skin: 'default'
|
|
trends: true
|
|
trends_as_landing_page: true
|
|
trendable_by_default: false
|
|
trending_status_cw: true
|
|
hide_followers_count: 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_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
|