mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 21:29:17 +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. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| disputes | ||
| filters | ||
| oauth | ||
| settings | ||
| well_known | ||
| about_controller.rb | ||
| accounts_controller.rb | ||
| application_controller.rb | ||
| authorize_interactions_controller.rb | ||
| backups_controller.rb | ||
| custom_css_controller.rb | ||
| emojis_controller.rb | ||
| filters_controller.rb | ||
| follower_accounts_controller.rb | ||
| following_accounts_controller.rb | ||
| health_controller.rb | ||
| home_controller.rb | ||
| instance_actors_controller.rb | ||
| intents_controller.rb | ||
| invites_controller.rb | ||
| manifests_controller.rb | ||
| media_controller.rb | ||
| media_proxy_controller.rb | ||
| privacy_controller.rb | ||
| relationships_controller.rb | ||
| shares_controller.rb | ||
| statuses_cleanup_controller.rb | ||
| statuses_controller.rb | ||
| tags_controller.rb | ||