This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app
Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
2023-04-09 11:45:08 +02:00
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
helpers Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
lib Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
mailers Add mail headers to avoid auto-replies (#23597) 2023-03-03 20:44:46 +01:00
models Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Remove unused InstancePresenter methods (#24206) 2023-03-22 14:15:22 +01:00
serializers Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
validators Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
views Fix glitch-soc HAML linting issues (#2166) 2023-04-07 20:55:28 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-04-01 14:31:05 +02:00