nyastodon/app
Claire c2f0ea415e Merge commit '899eac1a92' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.
2024-02-28 20:10:01 +01:00
..
chewy Clamp dates when serializing to Elasticsearch API (#28081) 2023-11-27 13:25:54 +00:00
controllers Merge commit '6f7615ba86' into glitch-soc/merge-upstream 2024-02-27 19:20:57 +01:00
helpers Merge commit 'aaa58d4807' into glitch-soc/merge-upstream 2024-02-24 14:27:43 +01:00
javascript Merge commit '899eac1a92' into glitch-soc/merge-upstream 2024-02-28 20:10:01 +01:00
lib Merge commit '6f7615ba86' into glitch-soc/merge-upstream 2024-02-27 19:20:57 +01:00
mailers Automatically switch from open to approved registrations in absence of moderators (#29318) 2024-02-22 20:45:40 +01:00
models Merge commit '8156113d58' into glitch-soc/merge-upstream 2024-02-26 17:43:16 +01:00
policies Merge commit '3205a654ca' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
presenters Add annual reports for accounts (#28693) 2024-01-24 09:38:10 +00:00
serializers Merge commit 'aaa58d4807' into glitch-soc/merge-upstream 2024-02-24 14:27:43 +01:00
services Merge commit '9d8dfeb5fb' into glitch-soc/merge-upstream 2024-02-24 15:35:56 +01:00
validators Merge commit '01ce9df880' into glitch-soc/merge-upstream 2024-01-24 20:42:53 +01:00
views Merge commit '8156113d58' into glitch-soc/merge-upstream 2024-02-26 17:43:16 +01:00
workers Fix auto-close email being sent to users with devops permissions instead of settings permissions (#29355) 2024-02-22 20:45:40 +01:00