mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-12 00:29:04 +01: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. |
||
|---|---|---|
| .. | ||
| build-image.yml | ||
| build-nightly.yml | ||
| check-i18n.yml | ||
| codeql.yml | ||
| haml-lint-problem-matcher.json | ||
| lint-css.yml | ||
| lint-haml.yml | ||
| lint-js.yml | ||
| lint-json.yml | ||
| lint-md.yml | ||
| lint-ruby.yml | ||
| lint-yml.yml | ||
| rebase-needed.yml | ||
| test-js.yml | ||
| test-migrations-one-step.yml | ||
| test-migrations-two-step.yml | ||
| test-ruby.yml | ||