glitch-soc/app
Claire 702d162998 Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
2023-10-08 16:48:19 +02:00
..
chewy Fix #hashtag matching non-hashtagged posts in search (#26781) 2023-09-04 10:18:45 +02:00
controllers Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 2023-10-08 16:48:19 +02:00
helpers Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 2023-10-08 16:48:19 +02:00
javascript Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 2023-10-08 16:48:19 +02:00
lib Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
mailers Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
models Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream 2023-10-08 16:41:56 +02:00
policies Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' 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 '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:07:29 +02:00
validators Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
views Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 2023-10-08 16:48:19 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-09-05 20:34:17 +02:00