155dc4bc4b
Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly. |
||
|---|---|---|
| .. | ||
| admin | ||
| account_moderation_note_policy.rb | ||
| account_policy.rb | ||
| account_warning_policy.rb | ||
| account_warning_preset_policy.rb | ||
| announcement_policy.rb | ||
| appeal_policy.rb | ||
| application_policy.rb | ||
| audit_log_policy.rb | ||
| backup_policy.rb | ||
| canonical_email_block_policy.rb | ||
| custom_emoji_policy.rb | ||
| dashboard_policy.rb | ||
| delivery_policy.rb | ||
| domain_allow_policy.rb | ||
| domain_block_policy.rb | ||
| email_domain_block_policy.rb | ||
| follow_recommendation_policy.rb | ||
| instance_policy.rb | ||
| invite_policy.rb | ||
| ip_block_policy.rb | ||
| poll_policy.rb | ||
| preview_card_policy.rb | ||
| preview_card_provider_policy.rb | ||
| relay_policy.rb | ||
| report_note_policy.rb | ||
| report_policy.rb | ||
| rule_policy.rb | ||
| settings_policy.rb | ||
| software_update_policy.rb | ||
| status_policy.rb | ||
| tag_policy.rb | ||
| terms_of_service_policy.rb | ||
| user_policy.rb | ||
| user_role_policy.rb | ||
| webhook_policy.rb | ||