1
0
puyopuyotetr.is/app
Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
2024-10-26 13:38:07 +02:00
..
chewy Clamp dates when serializing to Elasticsearch API (#28081) 2023-11-27 13:25:54 +00:00
controllers Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
helpers Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
javascript Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
lib Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
mailers Add coverage for missing status scenario in NotificationMailer (#32256) 2024-10-04 14:15:14 +00:00
models Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
policies Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream 2024-05-20 12:17:36 +02:00
presenters Extract ExportSummary class for account object counts (#32227) 2024-10-03 13:09:58 +00:00
serializers Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
services Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 2024-10-19 19:13:32 +02:00
validators Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
views Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 2024-10-19 19:13:32 +02:00
workers Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00