chuckya/app
Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
..
chewy Change algorithm of tootctl search deploy to improve performance (#18463) 2022-05-22 22:16:43 +02:00
controllers Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
helpers Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
javascript Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
lib Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
mailers Add user handle to notification mail recipient address (#24240) 2023-04-17 11:06:06 +02:00
models Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Fix Performance/CollectionLiteralInLoop cop (#24819) 2023-05-04 05:33:55 +02:00
serializers Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
services Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
validators Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream 2023-05-25 23:47:28 +02:00
views Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
workers Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00