mastodon/app
Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
..
chewy Change algorithm of `tootctl search deploy` to improve performance (#18463) 2022-05-22 22:16:43 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
mailers Add mail headers to avoid auto-replies (#23597) 2023-03-03 20:44:46 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Remove unused InstancePresenter#sample_accounts method (#23900) 2023-02-27 19:03:35 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00