Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,890 Commits 74 Branches 58 Tags
3f166bb068151de30c7e7cff69f6ce167cabf13c
Commit Graph

290 Commits

Author SHA1 Message Date
Claire
3f166bb068 Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream 2025-08-05 15:46:33 +02:00
Claire
1fd3510b32 Change the quote revocation REST API endpoint to return updated quote post (#35677) 2025-08-05 09:42:58 +00:00
Claire
dbab707d64 Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream 2025-08-01 22:11:59 +02:00
Claire
2dfdcc7dcb Add API endpoints to view and revoke one's quoted posts (#35578) 2025-07-31 09:36:51 +00:00
Claire
8649681c51 Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added context extensions where glitch-soc had its own.
  Added upstream's new context extension while keeping ours.
 2025-07-25 21:45:00 +02:00
Claire
5a88b7f683 Add experimental basic quote post authoring (#35355) 2025-07-25 12:35:24 +00:00
Claire
72affd6b45 Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
  Conflict because of upstream VS glitch-soc repos.
  Updated version number as upstream did, but kept glitch-soc repos.
 2025-07-24 18:10:38 +02:00
Matt Jankowski
e54e96d61f Extract params hash for api/v1/push/subscriptions#create (#35475) 2025-07-24 07:49:20 +00:00
Claire
7da6b07c75 Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream 2025-06-13 18:07:59 +02:00
Matt Jankowski
ab7f50ce4e Reduce hard coding of LOCAL_DOMAIN env value throughout tests (#35025) 2025-06-13 07:58:22 +00:00
David Roetzel
319fbbbfac Experimental Async Refreshes API (#34918) 2025-06-12 14:54:00 +00:00
Claire
c00e27aa55 Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream 2025-05-30 17:41:31 +02:00
Matt Jankowski
f7a3dd0e38 Use config_for for VAPID key storage (#34845) 2025-05-30 07:00:33 +00:00
Claire
b627aee45f Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
 2025-05-28 18:41:47 +02:00
Emelia Smith
a73ade526a Assert usage of client credentials for account registration (#34828) 2025-05-28 12:09:32 +00:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Claire
dae6f19490 Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream 2025-04-25 17:22:10 +02:00
Eugen Rochko
a97647158c Add REST API for featuring and unfeaturing a hashtag (#34489) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-04-25 15:12:05 +00:00
Claire
7bc301e184 Make Web::PushSubscription#user and Web::PushSubscription#access_token relationships non-optional (#34498) 
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
 2025-04-23 08:12:31 +00:00
Claire
dee744c793 Fix quote serializer (#34510) 2025-04-23 07:29:13 +00:00
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
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
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
Matt Jankowski
f71a855e2d Add coverage for standard params on push subs create (#34092) 2025-03-12 14:29:19 +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
b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01: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
19fa4cfcf2 Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream 2025-01-23 13:38:23 +01:00
Matt Jankowski
607f65a0a5 Use expect for api/v1 and api/web push subs controllers (#33682) 2025-01-22 14:55:44 +00:00
Claire
297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
Christian Schmidt
a3baae0b99 API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00:00
Claire
f6a0cd9d1a Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream 2025-01-16 11:16:53 +01:00
Matt Jankowski
72abf05269 Add "needs refresh" scenario to api/v1/polls request spec (#33608) 2025-01-16 09:00:04 +00:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00
Wolfgang
77a44e61a8 Add enum validation to DomainBlock#severity (#29158) 2025-01-13 16:05:24 +00:00
Daniel M Brasil
0db7558822 Fix HTTP 500 on POST /api/v1/admin/ip_blocks (#29308) 2025-01-13 13:50:58 +00:00
Matt Jankowski
3c4a83fc62 Remove unused LanguagePresenter#native_name (#33551) 2025-01-13 12:58:53 +00:00
Claire
155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
 2025-01-10 20:41:36 +01:00
Matt Jankowski
b3243ef41c Refer to constant values from api/v1/apps request spec (#33488) 2025-01-07 16:28:54 +00:00
Matt Jankowski
efcd4ea5de Reference value constants from specs (#33479) 2025-01-06 23:25:13 +00:00
Claire
68106f250c Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream 2025-01-03 12:34:47 +01:00