Claire
8cbd99e645
Merge commit 'a324edabdfc19b6978ed31800b92e36022006cd5' into glitch-soc/merge-upstream
2025-04-21 14:32:47 +02:00
Eugen Rochko
ff0990ec9f
Add REST API for fetching an account's endorsed accounts ( #34421 )
2025-04-16 05:39:20 +00:00
Matt Jankowski
2eaef09166
Use enum validation instead of ArgumentError rescue for List replies policy check ( #34452 )
2025-04-14 21:11:10 +00:00
Claire
4b491674b2
Merge commit '887336f2c66b6ac5049d10bf5f27fa69a15e0745' into glitch-soc/merge-upstream
2025-04-08 19:12:28 +02:00
Claire
36afb4557a
Fix incorrect deprecation warning for DELETE /api/v1/suggestions/:id ( #34397 )
2025-04-08 14:32:17 +00:00
Claire
99e3ea232f
Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream
2025-04-04 20:00:24 +02:00
David Roetzel
e2ef173b82
Refactoring: Move SignatureVerificationError into Mastodon namespace ( #34342 )
2025-04-02 07:54:29 +00:00
Claire
f8b0f38636
Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream
2025-03-29 17:02:39 +01:00
David Roetzel
97b9994743
Basic FASP support ( #34031 )
2025-03-28 12:16:40 +00:00
Claire
745c445e7e
Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream
2025-03-25 19:59:59 +01:00
Claire
38f5e74122
Add Deprecation headers on deprecated endpoints ( #34262 )
...
Co-authored-by: Damien Mathieu <42@dmathieu.com>
2025-03-25 12:30:10 +00:00
Claire
e7498887a7
Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Upstream removed some code that somehow had been modified in glitch-soc.
Removed it as upstream did.
2025-03-24 20:06:25 +01:00
Claire
5390edc2aa
Change user archive signed URL TTL from 10 seconds to 1 hour ( #34254 )
2025-03-24 09:59:05 +00:00
Claire
0efa669fe9
Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream
2025-03-15 17:49:32 +01:00
Eugen Rochko
d213c585ff
Add age verification on sign-up ( #34150 )
2025-03-14 14:07:29 +00:00
Claire
b330cc21c4
Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream
2025-03-12 19:48:51 +01:00
Jonny Saunders
46e13dd81c
Add Fetch All Replies Part 1: Backend ( #32615 )
...
Signed-off-by: sneakers-the-rat <sneakers-the-rat@protonmail.com>
Co-authored-by: jonny <j@nny.fyi>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Kouhai <66407198+kouhaidev@users.noreply.github.com>
2025-03-12 09:03:01 +00:00
Claire
399fbf97de
Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream
2025-03-11 18:44:32 +01:00
Claire
420ffdfb62
Add delay to profile updates to debounce them ( #34137 )
2025-03-11 16:17:17 +00:00
Claire
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
Claire
dbd3e05812
Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream
2025-03-07 17:37:36 +01:00
Claire
b6f3cfb302
Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream
2025-03-06 20:10:00 +01:00
Claire
5a100bf38f
Add ability to email announcements to all users ( #33928 )
2025-03-06 14:05:27 +00:00
Eugen Rochko
cadda2f957
Add effective date to terms of service ( #33993 )
2025-03-05 09:01:33 +00:00
Emelia Smith
4960193ed0
Add API to delete media attachments that are not in use ( #33991 )
2025-02-28 13:41:42 +00:00
Claire
e71fb450e0
Add optional delete_media parameter to DELETE /api/v1/statuses/:id ( #33988 )
2025-02-28 13:39:01 +00:00
Claire
1cdd91d6f1
Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream
2025-02-27 15:52:20 +01:00
Jeremy Kescher
6b519cfefa
Merge commit from fork
...
* Fix domain blocks/rationales being visible to unapproved/unconfirmed users
* Fix domain blocks/rationales being visible to suspended users
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Allow moved users to view domain blocks
* Add authorization specs for `/api/v1/instance/domain_blocks` spec
* Fix tests
* Fix incorrect test setup
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-02-27 15:49:57 +01:00
Claire
a682bd19f5
Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream
2025-02-25 18:52:24 +01:00
Claire
20531d1e07
Fix GET /api/v2/notifications/:id and POST /api/v2/notifications/:id/dismiss for ungrouped notifications ( #33990 )
2025-02-25 14:37:44 +00:00
Claire
28d85ede4c
Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream
2025-02-12 18:40:21 +01:00
Claire
6b52227fcc
Fix Mastodon listing updates older or equal to current version ( #33906 )
2025-02-12 14:27:42 +00:00
Claire
db59f37269
Fix redirect after log-in when allow_referrer_origin setting is enabled ( #33903 )
2025-02-12 12:58:48 +00:00
Claire
6ab5b9c790
Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
- `.github/workflows/build-releases.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
- `.github/workflows/build-security.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
2025-02-05 18:21:36 +01:00
Matt Jankowski
c3419d146a
Remove duplicate cache header setting before action ( #33833 )
2025-02-05 09:19:08 +00:00
Claire
1dbeac2196
Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream
2025-02-04 18:38:41 +01:00
Claire
5553941666
Drop custom scopes conversion code from /settings/applications controller ( #33819 )
2025-02-04 09:31:42 +00:00
Claire
cf820b2eca
Fix /settings/applications rejecting scopes parameter ( #33798 )
2025-02-02 21:11:32 +00:00
Claire
353e5f797c
Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream
...
Conflicts:
- `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.
2025-01-28 18:29:46 +01:00
Claire
5b291fcbe4
Fix incorrect signature after HTTP redirect ( #33757 )
2025-01-28 14:44:27 +00:00
Claire
fcc5262f60
Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
Upstream tests for changing themes in there, but glitch-soc has
its own place for that.
Updated upstream's change while skipping the theme test.
2025-01-27 18:19:09 +01:00
Matt Jankowski
93f3c724ae
Use expect in remaining controller locations ( #33748 )
2025-01-27 16:32:06 +00:00
Matt Jankowski
d3b637c757
Use expect in Admin::ExportControllerConcern import params ( #33745 )
2025-01-27 14:29:25 +00:00
Matt Jankowski
65d9171c7d
Use expect for admin/ controllers ( #33686 )
2025-01-27 14:05:16 +00:00
Matt Jankowski
a1d9c3fb99
Use expect params wrapper for more "auth" and "2FA" "controllers" ( #33717 )
2025-01-24 14:40:20 +00:00
Claire
19fa4cfcf2
Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream
2025-01-23 13:38:23 +01:00
Matt Jankowski
8eee7ae4c3
Fix issue with saving empty fields values on filter keyword updates ( #33691 )
2025-01-23 09:04:12 +00:00
Matt Jankowski
4a9c49ee43
Fix issue with saving empty fields values on profile update ( #33689 )
2025-01-22 18:50:15 +00:00
Matt Jankowski
607f65a0a5
Use expect for api/v1 and api/web push subs controllers ( #33682 )
2025-01-22 14:55:44 +00:00
Matt Jankowski
e155aab39e
Use expect for nested params in settings/* controllers ( #33673 )
2025-01-22 08:49:52 +00:00
