mastodon/app/views/filters
Claire f39d9ab256 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
..
statuses Fix error when accessing /filters/:id/statuses on glitch-soc (#1837) 2022-08-31 11:55:27 +02:00
_filter.html.haml Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
_filter_fields.html.haml Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
_keyword_fields.html.haml Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
edit.html.haml Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
index.html.haml Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
new.html.haml Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00