Commit Graph

23640 Commits

Author SHA1 Message Date
Claire
9e1c33f96a Merge upstream changes up to a86078e8bb into stable-4.3 (#3196)
* Fix getting `Create` and `Update` out of order (#36176)

* Fix processing of out-of-order `Update` as implicit updates (#36190)

* Update dependency `rexml`

* Bump version to v4.3.13
v4.3.13
2025-09-23 18:47:29 +02:00
Claire
ef4ecd5eeb Merge commit 'a86078e8bb082eb15e0fd0d183a8a610f043827f' into glitch-soc/merge-4.3 2025-09-23 18:19:32 +02:00
Claire
a86078e8bb Bump version to v4.3.13 2025-09-23 14:33:27 +02:00
Claire
a3a02549e8 Update dependency rexml 2025-09-23 14:33:27 +02:00
Claire
06081721ef Fix processing of out-of-order Update as implicit updates (#36190) 2025-09-23 14:33:27 +02:00
Claire
60771df3e7 Fix getting Create and Update out of order (#36176) 2025-09-23 14:33:27 +02:00
Claire
21b324cc88 Merge pull request #3183 from ClearlyClaire/glitch-soc/merge-4.3
Merge upstream changes up to 51b29f4c30 to stable-4.3
v4.3.12
2025-09-16 18:17:29 +02:00
Claire
5f07606955 Merge commit '51b29f4c30ef40d6f4ca6f8589b6093a5665c3a3' into glitch-soc/merge-4.3 2025-09-16 18:01:13 +02:00
Claire
51b29f4c30 Bump version to v4.3.12 2025-09-16 13:54:37 +02:00
Claire
0ec46833fa Update rails dependencies 2025-09-16 13:54:37 +02:00
Claire
de488fbea2 Merge pull request #3175 from ClearlyClaire/glitch-soc/merge-4.3
Merge upstream changes up to 6b78be274b into stable-4.3
2025-09-05 19:24:46 +02:00
Claire
d595641b73 [Glitch] Fix editing or deleting and redrafting polls in 4.3
Port 055be70c59 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-09-05 12:18:27 +02:00
Claire
fd733d0603 Merge remote-tracking branch 'upstream/stable-4.3' into glitch-soc/merge-4.3 2025-09-05 12:18:08 +02:00
Claire
055be70c59 Fix editing or deleting and redrafting polls in 4.3 (#36036) 2025-09-05 12:17:02 +02:00
Claire
0eeb0f00ba [Glitch] Fix API return types for interaction API helpers
Port 8777443c9b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-09-04 19:18:23 +02:00
Claire
6e406e119f [Glitch] Fix Edit as well as “Delete & Redraft” on a poll not inserting empty option
Port a48567784c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-09-04 19:18:17 +02:00
Claire
789df6b196 Merge remote-tracking branch 'upstream/stable-4.3' into glitch-soc/merge-4.3 2025-09-04 19:14:04 +02:00
fiona
6b78be274b Fix handling of edited status with new media and no text (#35970) 2025-09-04 15:44:53 +02:00
Claire
a3d4b7c9b9 Fix API return types for interaction API helpers (#35915) 2025-09-04 15:44:53 +02:00
Claire
d2b544e584 Fix Edit as well as “Delete & Redraft” on a poll not inserting empty option (#35892) 2025-09-04 15:44:53 +02:00
Claire
84c5ffb565 Fix self-destruct scheduler behavior on some Redis setups (#35823) 2025-09-04 15:44:53 +02:00
Claire
1d26fa9fed Merge pull request #3151 from ClearlyClaire/glitch-soc/backports-4.3
Merge upstream changes up to v4.3.11
v4.3.11
2025-08-05 15:31:47 +02:00
Claire
62f21ab1fc Merge commit '42594f253e64c559ca2462abab0623dddc82f54c' into glitch-soc/backports-4.3 2025-08-05 15:16:11 +02:00
Claire
42594f253e Bump version to v4.3.11 (#35685) 2025-08-05 15:14:32 +02:00
Claire
b21e29cc7c Merge commit from fork 2025-08-05 14:53:04 +02:00
github-actions[bot]
ef8b45f004 New Crowdin Translations for stable-4.3 (automated) (#35682)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-08-05 14:02:30 +02:00
Claire
16a3fcbe26 Update dependency ruby-saml to v1.18.1 2025-08-05 11:43:25 +02:00
Claire
65f1d77043 Disable ActiveRecord query cache in Create critical path (#35662) 2025-08-05 11:43:25 +02:00
Claire
6202cf6b65 Fix WebUI crashing for accounts with null URL (#35651) 2025-08-05 11:43:25 +02:00
Claire
8ee8228d46 Fix friends-of-friends recommendations suggesting already-requested accounts (#35604) 2025-08-05 11:43:25 +02:00
Claire
18869e9c90 Merge pull request #3139 from ClearlyClaire/glitch-soc/backports-4.3
Merge upstream changes up to v4.3.10 into stable-4.3
v4.3.10
2025-07-23 18:26:07 +02:00
Claire
70ca99224f Merge commit '2232de0bfa6ce1854cd4cb4f7080a181be0b5a35' into glitch-soc/backports-4.3 2025-07-23 18:06:51 +02:00
David Roetzel
2232de0bfa Update dependency thor 2025-07-23 16:07:56 +02:00
David Roetzel
37b642d59c Bump version to v4.3.10 2025-07-23 16:07:56 +02:00
Claire
11ec1a8d7b Update security policy (#35292) 2025-07-08 17:32:27 +02:00
Claire
ec8c7dca2f Merge pull request #3117 from ClearlyClaire/glitch-soc/merge-4.3
Merge upstream changes up to f6dbb2206c
v4.3.9
2025-07-02 19:21:12 +02:00
Claire
b6264ea625 [Glitch] Fix “Alt text” button submitting form in moderation interface
Port 973eb0a1d3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-07-02 19:06:58 +02:00
Jeremy Kescher
36c5b0e2f0 [Glitch] Fix /share not using server-set characters limit
Port 44a88ad4d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-07-02 19:06:58 +02:00
Jeong Arm
645c910d38 [Glitch] Add missing autofocus on boost modal
Port e517c2a1bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-07-02 19:06:58 +02:00
Claire
a076fa2063 Merge commit 'f6dbb2206c5a4c1b27ce1395b477492139cfcbcc' into glitch-soc/merge-4.3 2025-07-02 19:06:55 +02:00
Claire
f6dbb2206c Bump version to v4.3.9 2025-07-02 12:51:46 +02:00
Darius Kazemi
ea6736681b Fix NoMethodError in edge case of emoji cache handling (#34749)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-07-02 12:51:46 +02:00
Claire
9ee5872f14 Fix error when viewing statuses to deleted replies in moderation view (#32986) 2025-07-02 12:51:46 +02:00
Claire
447527c154 Fix search operators sometimes getting lost (#35190) 2025-07-02 12:51:46 +02:00
Claire
973eb0a1d3 Fix “Alt text” button submitting form in moderation interface (#35147) 2025-07-02 12:51:46 +02:00
Claire
5039e9d474 Add basic support for remote attachments with multiple media types (#34996) 2025-07-02 12:51:46 +02:00
Claire
980c336ca4 Fix blocked accounts not being automatically removed from trending statuses (#34891) 2025-07-02 12:51:46 +02:00
Claire
4632be68eb Fix inconsistent filtering of silenced accounts for other silenced accounts (#34863) 2025-07-02 12:51:46 +02:00
Claire
8db52f2e66 Increase capybara default timeout to reduce test flakiness (#34859) 2025-07-02 12:51:46 +02:00
Claire
b38bbd04ea Fix NoMethodError in ActivityPub::FetchFeaturedCollectionService (#34811) 2025-07-02 12:51:46 +02:00