mirror of
https://github.com/funamitech/mastodon
synced 2025-01-24 10:44:14 +09:00
0aa69487a2
Conflicts: - `app/models/concerns/user/has_settings.rb`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `app/views/settings/preferences/appearance/show.html.haml`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `config/routes.rb`: Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had an extra route. Moved the extra route to `config/routes/web_app.rb`. - `spec/controllers/settings/preferences/appearance_controller_spec.rb`: This spec got converted to a system spec upstream. However, the theme setting works differently in glitch-soc, so the spec had been changed. Changed the corresponding system spec as well. |
||
|---|---|---|
| .. | ||
| admin | ||
| account_moderation_note_policy_spec.rb | ||
| account_policy_spec.rb | ||
| account_warning_policy_spec.rb | ||
| account_warning_preset_policy_spec.rb | ||
| announcement_policy_spec.rb | ||
| appeal_policy_spec.rb | ||
| audit_log_policy_spec.rb | ||
| backup_policy_spec.rb | ||
| canonical_email_block_policy_spec.rb | ||
| custom_emoji_policy_spec.rb | ||
| dashboard_policy_spec.rb | ||
| delivery_policy_spec.rb | ||
| domain_allow_policy_spec.rb | ||
| domain_block_policy_spec.rb | ||
| email_domain_block_policy_spec.rb | ||
| follow_recommendation_policy_spec.rb | ||
| instance_policy_spec.rb | ||
| invite_policy_spec.rb | ||
| ip_block_policy_spec.rb | ||
| poll_policy_spec.rb | ||
| preview_card_policy_spec.rb | ||
| preview_card_provider_policy_spec.rb | ||
| relay_policy_spec.rb | ||
| report_note_policy_spec.rb | ||
| report_policy_spec.rb | ||
| rule_policy_spec.rb | ||
| settings_policy_spec.rb | ||
| software_update_policy_spec.rb | ||
| status_policy_spec.rb | ||
| tag_policy_spec.rb | ||
| terms_of_service_policy_spec.rb | ||
| user_policy_spec.rb | ||
| user_role_policy_spec.rb | ||
| webhook_policy_spec.rb | ||