mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 12:24:31 +00: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. |
||
|---|---|---|
| .. | ||
| accounts_cli.rb | ||
| cache_cli.rb | ||
| canonical_email_blocks_cli.rb | ||
| cli_helper.rb | ||
| domains_cli.rb | ||
| email_domain_blocks_cli.rb | ||
| emoji_cli.rb | ||
| feeds_cli.rb | ||
| ip_blocks_cli.rb | ||
| maintenance_cli.rb | ||
| media_cli.rb | ||
| migration_helpers.rb | ||
| migration_warning.rb | ||
| premailer_webpack_strategy.rb | ||
| preview_cards_cli.rb | ||
| rack_middleware.rb | ||
| redis_config.rb | ||
| search_cli.rb | ||
| settings_cli.rb | ||
| sidekiq_middleware.rb | ||
| snowflake.rb | ||
| statuses_cli.rb | ||
| upgrade_cli.rb | ||
| version.rb | ||