1666289b08
Merge branch 'refs/heads/upstream-stable/4.3' into stable/4.3
2025-02-27 17:08:50 +01:00
Claire
baac429103
Merge commit 'b1a584d252f4df4c2a1a9400d6588b4f36768216' into glitch-soc/merge-4.3
...
Conflicts:
- `app/lib/feed_manager.rb`:
Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
Added upstream's code.
In addition, upstream changed how notifications from follow subscriptions were
handled, refactoring this file in the process.
Ported upstream's changes.
- `app/services/precompute_feed_service.rb`:
Not a real conflict, glitch-soc has extra code for the direct feed.
Added upstream's new code for populating lists.
- `app/validators/poll_options_validator.rb`:
Upstream split `PollValidator` in two, and glitch-soc had local changes to
make the options configurable.
Refactored as upstream did, keeping glitch-soc's configurable limits.
- `app/workers/feed_insert_worker.rb`:
Upstream changed how notifications from follow subscriptions were handled,
refactoring this file in the process.
Conflict is due to glitch-soc having an extra timeline type (direct).
Ported upstream's changes.
2025-02-25 18:33:54 +01:00
Claire
8787077462
Fix GET /api/v2/notifications/:id and POST /api/v2/notifications/:id/dismiss for ungrouped notifications ( #33990 )
2025-02-25 17:11:09 +01:00
Claire
b32a67ff74
Fix tootctl feeds build not building list timelines ( #33783 )
2025-02-25 17:11:09 +01:00
Claire
2b148d3e88
Fix polls not being validated on edition ( #33755 )
2025-02-25 17:11:09 +01:00
Matt Jankowski
74496838e7
Add UserRole#bypass_block? method for notification check ( #32974 )
2025-02-25 17:11:09 +01:00
d798e6a380
Merge branch 'upstream-stable/4.3' into stable/4.3
2025-01-16 17:40:45 +01:00
Claire
63f4e2070c
Merge commit 'faed9bf9f14f077443374f5eb3075b9878e24214' into glitch-soc/stable-4.3
2025-01-16 11:43:10 +01:00
Claire
757aed3290
Fix error decrementing status count when FeaturedTags#last_status_at is nil ( #33320 )
2025-01-16 11:42:36 +01:00
Claire
3cff7caffd
Fix last paginated notification group only including data on a single notification ( #33271 )
2025-01-16 11:42:36 +01:00
Claire
734f0dd182
Fix fediverse:creator metadata not showing up in REST API ( #33466 )
2025-01-16 11:42:36 +01:00
Matt Jankowski
bcc798d6a7
Fix empty authors preview card serialization ( #33151 )
2025-01-16 11:42:36 +01:00
1fb818a685
Merge branch 'upstream-stable/4.3' into stable/4.3
2024-12-30 00:50:29 +01:00
Claire
0d69cc068c
Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3
...
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/trends/statuses.rb`:
Upstream added a date restriction to trendable posts, while glitch-soc had
slightly different conditions.
Added the date restriction to glitch-soc's conditions.
2024-12-02 21:49:12 +01:00
Claire
15e1a63e4a
Fix direct inbox delivery pushing posts into inactive followers' timelines ( #33067 )
2024-12-02 16:20:32 +01:00
Claire
6b8ff1cf6e
Fix TagFollow records not being correctly handled in account operations ( #33063 )
2024-12-02 16:20:32 +01:00
Eugen Rochko
6cbd217055
Fix pushing hashtag-followed posts to feeds of inactive users ( #33018 )
2024-12-02 16:20:32 +01:00
Claire
e06448e652
Fix posts made in the future being allowed to trend ( #32996 )
2024-12-02 16:20:32 +01:00
Claire
0cbf03efa7
Fix list creation limit check ( #32869 )
2024-12-02 16:20:32 +01:00
Claire
dc9a106d4c
Avoid latest featured tag use on post removal unless necessary ( #32787 )
2024-12-02 16:20:32 +01:00
Jeong Arm
9b677f099e
Fix that blocking was not working on link timeline ( #32625 )
2024-12-02 16:20:32 +01:00
Matt Jankowski
dbedd021f5
Move account suspension-related methods to concern ( #28351 )
2024-12-02 16:20:32 +01:00
b58bc7102e
Merge branch 'upstream-stable/4.3' into stable/4.3
2024-11-01 17:03:17 +01:00
Claire
2b0410f903
Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-18 17:19:57 +02:00
Claire
d728fa9991
Fix follow recommendation moderation page default language when using regional variant ( #32580 )
2024-10-18 15:49:26 +02:00
Claire
b091e531a5
Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-soc/backports-4.3
2024-10-15 17:42:22 +02:00
Claire
192e9d16eb
Fix follow recommendation suppressions not applying immediately ( #32392 )
2024-10-15 11:57:59 +02:00
Claire
b40adb4a89
Merge commit 'f99da81ef8b14a851347503d4177f83322c16d9a' into glitch-soc/stable-4.3
2024-10-14 19:18:08 +02:00
Claire
e5e0144957
Fix notification requests from suspended accounts still being listed ( #32354 )
2024-10-14 13:14:38 +02:00
9090719153
Merge remote-tracking branch 'refs/remotes/upstream/stable-4.3' into develop
2024-10-10 22:57:13 +02:00
Claire
dfe851b476
Merge branch 'stable-4.3' into glitch-soc/backports-4.3
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
2024-10-05 20:45:05 +02:00
Matt Jankowski
5c72b46a4e
Clean up labels on development application form ( #32116 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
7de8d5ffca
Add relevant_params to ReportFilter (matches account filter) ( #32136 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
74291dfb77
Remove unneeded reorder(nil) conditions ( #32200 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
f07707a9bb
Extract WebPushRequest from push notification worker and subscription ( #32208 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
1e19242134
Extract constants for header and avatar geometry ( #32151 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
66ef4b9984
Remove WebfingerHelper module & move usage inline ( #31203 )
2024-10-04 17:48:03 +02:00
David Roetzel
ce2481a81b
Move OTP secret length to configuration ( #32125 )
2024-10-04 17:48:03 +02:00
1290a5609d
Merge branch 'glitch-v4.3.0-rc.1' into develop
2024-10-03 22:25:40 +02:00
Claire
9af9ef6fb3
Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream
2024-09-30 13:04:19 +02:00
Claire
0c872beed4
Merge commit from fork
...
This should not change the set of words matched by `USERNAME_RE` but does
change the one matched by `MENTION_RE`. Indeed, the previous regexp allowed
a domain part to start with `.` or `-`, which the new regexp does not allow.
2024-09-30 12:25:54 +02:00
Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
Matt Jankowski
e02e88bff4
Use previously extracted model constants in form maxlength attributes ( #32113 )
2024-09-27 08:21:27 +00:00
Claire
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
Renaud Chaput
d6f5ee75ab
Add notification grouping for follow notifications ( #32085 )
2024-09-25 13:36:19 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
655d28f6a7
Merge remote-tracking branch 'upstream/main' into develop
...
Also apply "Make addReaction and removeReaction optional props", therefore:
Co-authored by: Essem <smswessem@gmail.com>
2024-09-20 11:53:07 +02:00
Matt Jankowski
04a939d640
Add reviewed and unreviewed scopes to Reviewable model concern ( #31988 )
2024-09-20 08:51:37 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Claire
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
