mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-29 03:53:52 +00:00
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_actions_controller.rb | ||
account_moderation_notes_controller.rb | ||
accounts_controller.rb | ||
action_logs_controller.rb | ||
announcements_controller.rb | ||
base_controller.rb | ||
change_emails_controller.rb | ||
confirmations_controller.rb | ||
custom_emojis_controller.rb | ||
dashboard_controller.rb | ||
domain_allows_controller.rb | ||
domain_blocks_controller.rb | ||
email_domain_blocks_controller.rb | ||
follow_recommendations_controller.rb | ||
instances_controller.rb | ||
invites_controller.rb | ||
ip_blocks_controller.rb | ||
pending_accounts_controller.rb | ||
relationships_controller.rb | ||
relays_controller.rb | ||
report_notes_controller.rb | ||
reported_statuses_controller.rb | ||
reports_controller.rb | ||
resets_controller.rb | ||
roles_controller.rb | ||
rules_controller.rb | ||
settings_controller.rb | ||
site_uploads_controller.rb | ||
statuses_controller.rb | ||
subscriptions_controller.rb | ||
tags_controller.rb | ||
two_factor_authentications_controller.rb | ||
warning_presets_controller.rb |