6fdc4e8d47
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
90 lines
2.2 KiB
YAML
90 lines
2.2 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: 'dev.glitch.social'
|
|
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
|
|
hide_network: 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
|
|
enable_keybase: true
|
|
flavour: 'glitch'
|
|
skin: 'default'
|
|
aggregate_reblogs: true
|
|
advanced_layout: false
|
|
use_blurhash: true
|
|
use_pending_items: false
|
|
trends: true
|
|
trendable_by_default: false
|
|
crop_images: true
|
|
notification_emails:
|
|
follow: false
|
|
reblog: false
|
|
favourite: false
|
|
mention: false
|
|
follow_request: true
|
|
digest: true
|
|
report: true
|
|
pending_account: true
|
|
trending_tag: true
|
|
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
|
|
enable_bootstrap_timeline_accounts: true
|
|
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'
|
|
spam_check_enabled: true
|
|
show_domain_blocks: 'disabled'
|
|
show_domain_blocks_rationale: 'disabled'
|
|
outgoing_spoilers: ''
|
|
|
|
development:
|
|
<<: *defaults
|
|
|
|
test:
|
|
<<: *defaults
|
|
|
|
production:
|
|
<<: *defaults
|