Merge upstream - 4.3.0.alpha5 #65

sneakers-the-rat · 2024-09-23T00:13:34Z

Mergin from upstream while deploying #63

Inconsequential except for

Removed mathjax from embed template - i think packing like a few MB of mathjax into previews is probably rude given the rate at which it's used
Removed StatusExpandButton from main DetailedStatus view, as upstream replaced that with their own ContentWarning button. Kept it in the general status component because that still needs a button when posts are collapsed (otherwise glitch-soc just shows nothing)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: GitHub Actions <[email protected]>

…olicy` (mastodon#31244)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…notifications to return (mastodon#31746)

mastodon#31745)

…astodon#31613)

…todon#31751)

)

…oc/merge-upstream Conflicts: - `spec/lib/sanitize/config_spec.rb`: Upstream rewrote top-level `describe` calls to `RSpec.describe`, and glitch-soc had differences in the first few tests because of the wider subset of HTML it accepts. Changed `describe` to `RSpec.describe` as upstream did, keeping glitch-soc's tests.

…en polling Port fab29eb to glitch-soc Signed-off-by: Claire <[email protected]>

… reports Port 585e369 to glitch-soc Signed-off-by: Claire <[email protected]>

…se (mastodon#31753)

…ady (mastodon#31754)

…astodon#31988)

…n#31994)

…1990) Co-authored-by: Claire <[email protected]>

…on#31991)

…mastodon#31981)

)

…astodon#32001)

* New Crowdin translations * Fix bogus `no.yml` * Fix bogus `simple_form.no.yml` --------- Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Claire <[email protected]>

…oc/merge-upstream

Port 7740f1a to glitch-soc Signed-off-by: Claire <[email protected]>

Port 8b70834 to glitch-soc Signed-off-by: Claire <[email protected]>

Port 29656cb to glitch-soc Signed-off-by: Claire <[email protected]>

…ns in web UI Port ef4d6ab to glitch-soc Signed-off-by: Claire <[email protected]>

…us location if path is omitted Port 57a38f0 to glitch-soc Signed-off-by: Claire <[email protected]>

Port ae03e4f to glitch-soc Signed-off-by: Claire <[email protected]>

Port e7fd098 to glitch-soc Signed-off-by: Claire <[email protected]>

…e-upstream Merge upstream changes up to 7ed9c59

Partially apply 500f492 to glitch-soc Signed-off-by: Claire <[email protected]>

Port b265a65 to glitch-soc Signed-off-by: Claire <[email protected]>

…ures/grouped-notifications-cw Add content warning support to grouped notifications

mjankowski and others added 30 commits September 4, 2024 05:12

Enable "zero monkey patching" mode in RSpec (mastodon#31614)

f1003b2

Remove accidental matcher debug code (mastodon#31732)

9ed1aab

Add coverage for model normalizations (mastodon#31734)

14af5b4

Fix Corepack prompt on Devcontainer (mastodon#31729)

a24049d

Update dependency sass to v1.78.0 (mastodon#31739)

612802b

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency aws-sdk-s3 to v1.160.0 (mastodon#31735)

3553d6c

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency test-prof to v1.4.2 (mastodon#31733)

2c6131c

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency ruby to v3.3.5 (mastodon#31719)

393a550

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

New Crowdin Translations (automated) (mastodon#31741)

1c17dca

Co-authored-by: GitHub Actions <[email protected]>

Extract method for self-referencing records in `AccountStatusCleanupP…

58df00f

…olicy` (mastodon#31244)

Update dependency shoulda-matchers to v6.4.0 (mastodon#31731)

ffe29ce

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update eslint (non-major) (mastodon#31684)

d8bd9ef

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency pino to v9.4.0 (mastodon#31720)

44fd080

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency pino-http to v10.3.0 (mastodon#31721)

7fb8834

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency postcss to v8.4.45 (mastodon#31742)

36710ae

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Allow POST /oauth/revoke through CORS (mastodon#31743)

ee55d20

Fix 500 error in GET /api/v2_alpha/notifications when there are no …

1fcffa5

…notifications to return (mastodon#31746)

Fix all notification types being stored without filtering when polling (

fab29eb

mastodon#31745)

Fix display name being displayed instead of domain in remote reports (m…

585e369

…astodon#31613)

Streaming: Improve Redis connection options handling (mastodon#31623)

9ba81ea

Add redis sentinel support to ruby part of code (mastodon#31744)

ef2bc8e

Use more accurate beginning/ending times in annual report source (mas…

fe04291

…todon#31751)

Use response.parsed_body for html response checks (mastodon#31750)

e1b5f3f

Fix email language when recipient has no selected locale (mastodon#31747

559958f

)

[Glitch] Fix all notification types being stored without filtering wh…

1d86377

…en polling Port fab29eb to glitch-soc Signed-off-by: Claire <[email protected]>

[Glitch] Fix display name being displayed instead of domain in remote…

1fb31ad

… reports Port 585e369 to glitch-soc Signed-off-by: Claire <[email protected]>

Fix glitch-soc-only tests

cb1eaa1

Add AnnualReport::Source#report_statuses method for subclasses to u…

4678473

…se (mastodon#31753)

Remove before block in spec with TODOs which have been TO-DONE alre…

4d5c91e

…ady (mastodon#31754)

mjankowski and others added 27 commits September 20, 2024 08:51

Add reviewed and unreviewed scopes to Reviewable model concern (m…

04a939d

…astodon#31988)

Change zoom icon in web UI (mastodon#29683)

e7fd098

Change Mastodon to issue correctly-signed queries by default (mastodo…

8afa3bb

…n#31994)

Move default embed size knowledge into OEmbedSerializer (mastodon#3…

bdf83c3

…1990) Co-authored-by: Claire <[email protected]>

Use heredoc/squish for inline css styles in oembed serializer (mastod…

a7dbf6f

…on#31991)

Add response.content_type checks for JSON to api/v1 request specs (…

6632606

…mastodon#31981)

Add coverage for CSV responses for severed relationships (mastodon#31962

171394e

)

Add content type checks to api/v2 request specs (mastodon#31983)

d55f4fb

Fix links for reblogs in moderation interface (mastodon#31979)

ed8b0e4

Fix issue when encountering reblog of deleted post in feed rebuild (m…

7ed9c59

…astodon#32001)

New Crowdin Translations (automated) (glitch-soc#2773)

b0f6d3e

* New Crowdin translations * Fix bogus `no.yml` * Fix bogus `simple_form.no.yml` --------- Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Claire <[email protected]>

Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-s…

221bba1

…oc/merge-upstream

[Glitch] Mute XHR abort errors

0820cbc

Port 7740f1a to glitch-soc Signed-off-by: Claire <[email protected]>

[Glitch] Fix the appearance of avatars when they do not load

d77348f

Port 8b70834 to glitch-soc Signed-off-by: Claire <[email protected]>

[Glitch] Fix sass deprecation warning

80cb285

Port 29656cb to glitch-soc Signed-off-by: Claire <[email protected]>

[Glitch] Fix browser glitch caused by two overlapping scroll animatio…

9bd5838

…ns in web UI Port ef4d6ab to glitch-soc Signed-off-by: Claire <[email protected]>

[Glitch] Fix custom history.push and history.replace building bog…

86b9d3b

…us location if path is omitted Port 57a38f0 to glitch-soc Signed-off-by: Claire <[email protected]>

[Glitch] Update directory page options to use URL params

03829d8

Port ae03e4f to glitch-soc Signed-off-by: Claire <[email protected]>

[Glitch] Change zoom icon in web UI

a969c6a

Port e7fd098 to glitch-soc Signed-off-by: Claire <[email protected]>

Merge pull request glitch-soc#2850 from ClearlyClaire/glitch-soc/merg…

5aebdc9

…e-upstream Merge upstream changes up to 7ed9c59

[Glitch] Change how content warnings and filters are displayed in web UI

7d97e3d

Partially apply 500f492 to glitch-soc Signed-off-by: Claire <[email protected]>

[Glitch] Fix wrong width on content warnings and filters in web UI

0d26c9f

Port b265a65 to glitch-soc Signed-off-by: Claire <[email protected]>

Replace new-style upstream CWs with old-style CWs for now

4d75493

Use new CW class in more places

7c148ed

Merge pull request glitch-soc#2852 from ClearlyClaire/glitch-soc/feat…

6ac6d86

…ures/grouped-notifications-cw Add content warning support to grouped notifications

merge-upstream

02d9f61

Merge branch 'dev' into merge-upstream

11942f7

sneakers-the-rat added the merge-upstream label Sep 23, 2024

update protobuf

31429d4

sneakers-the-rat merged commit 3739911 into dev Sep 23, 2024
30 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream - 4.3.0.alpha5 #65

Merge upstream - 4.3.0.alpha5 #65

sneakers-the-rat commented Sep 23, 2024

Merge upstream - 4.3.0.alpha5 #65

Merge upstream - 4.3.0.alpha5 #65

Conversation

sneakers-the-rat commented Sep 23, 2024