Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how releases are tagged, we don't have releases. Ignored the changes
[Glitch] fix buttons showing inconsistent styles Port ea10febd257b5b729a50aeb3218389763f5f4b97 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix filters not applying to explore tab Port af54bf52c83d9fa60efa4c9650e66ec0bcfd998d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports` Port c27b82a43763b44b0b2a2929b9cde588260581b4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
[Glitch] Change label and design of sensitive and unavailable media in web UI Port 338a0e70ccd2d5526e54fd67f99819e80643b45a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI Port ceeb2b8c419bce653fd9296c42ab655aa6a816f3 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.
[Glitch] simplify counters Port e0d230fb37848efd788eea54a83869a63ff0fb39 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Rewrite `<ShortNumber />` as FC and TS Port 20e85c0e837ef17219a1c317d7962286c9b4237d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Convert `<DismissableBanner>` to Typescript Port 4534498a8e43f59980ee56e9938efab8580c78c8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix translate button position Port 9f078e238d389199f9db42e408ec5606f5001417 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
Fix import order inconsistencies (#2289)
Update babel monorepo (#25930) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Fix sounds not being loaded from assets host (#25931)
Use invariant colors on notification toasts (#25919)
Fix incorrect syntax in Github action configuration (#25918)
Run the rebase conflict checker once an hour (#25914)