mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +09:00
12b935fadf
Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream. |
||
---|---|---|
.. | ||
disputes | ||
reports | ||
settings | ||
trends | ||
users | ||
webhooks | ||
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 | ||
export_domain_allows_controller.rb | ||
export_domain_blocks_controller.rb | ||
follow_recommendations_controller.rb | ||
instances_controller.rb | ||
invites_controller.rb | ||
ip_blocks_controller.rb | ||
relationships_controller.rb | ||
relays_controller.rb | ||
report_notes_controller.rb | ||
reports_controller.rb | ||
resets_controller.rb | ||
roles_controller.rb | ||
rules_controller.rb | ||
settings_controller.rb | ||
site_uploads_controller.rb | ||
statuses_controller.rb | ||
tags_controller.rb | ||
warning_presets_controller.rb | ||
webhooks_controller.rb |