mastodon/app
Claire 3947d7a153 Merge commit 'aeae2ebc0159bc2caadfc52313545f8e69c035e7' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
2023-09-15 21:25:05 +02:00
..
chewy Fix `#hashtag` matching non-hashtagged posts in search (#26781) 2023-09-04 10:18:45 +02:00
controllers Merge commit 'aeae2ebc0159bc2caadfc52313545f8e69c035e7' into glitch-soc/merge-upstream 2023-09-15 21:25:05 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-09-05 20:34:17 +02:00
javascript Merge commit 'aeae2ebc0159bc2caadfc52313545f8e69c035e7' into glitch-soc/merge-upstream 2023-09-15 21:25:05 +02:00
lib Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
mailers Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
models Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
policies Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
presenters Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
serializers Merge commit 'aeae2ebc0159bc2caadfc52313545f8e69c035e7' into glitch-soc/merge-upstream 2023-09-15 21:25:05 +02:00
services Merge commit 'aeae2ebc0159bc2caadfc52313545f8e69c035e7' into glitch-soc/merge-upstream 2023-09-15 21:25:05 +02:00
validators Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
views Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-09-05 20:34:17 +02:00