forked from treehouse/mastodon
e2a2bc9021
Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header. |
||
|---|---|---|
| .. | ||
| account_moderation_note_policy.rb | ||
| account_policy.rb | ||
| account_warning_preset_policy.rb | ||
| announcement_policy.rb | ||
| application_policy.rb | ||
| backup_policy.rb | ||
| custom_emoji_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 | ||
| relay_policy.rb | ||
| report_note_policy.rb | ||
| report_policy.rb | ||
| rule_policy.rb | ||
| settings_policy.rb | ||
| status_policy.rb | ||
| tag_policy.rb | ||
| user_policy.rb | ||