tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,701 Commits 5 Branches 0 Tags
Commit Graph

502 Commits

Author SHA1 Message Date
Tarrien
4d7cd0c6ab Update to latest 2025-03-24 12:12:44 -04:00
Claire
6f2979b0b0 Merge commit '547658f086b2bfb396f69822d7ba938e4c0caf80' into glitch-soc/merge-upstream 2025-03-18 22:03:50 +01:00
Matt Jankowski
795d465f8d
Convert disputes/strikes spec controller->request/system (#34191) 2025-03-18 08:18:36 +00:00
Matt Jankowski
8ef546fe6b
Convert oauth/tokens#revoke spec controller->request (#34174) 2025-03-18 08:16:42 +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
Matt Jankowski
325b55485e
Convert admin/settings/branding spec controller->request (#34130) 2025-03-11 13:32:39 +00:00
Claire
4bea9a0a66 Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream 2025-03-07 18:34:27 +01:00
Claire
b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01:00
Matt Jankowski
b021cfc91e
Convert settings/sessions spec controller->system (#34072) 2025-03-06 08:21:05 +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
Emelia Smith
febcd0a76c
Expose status language via og:locale (#34012) 2025-02-28 10:53:39 +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
06f879ce9b
Merge commit from fork 
* Add rate-limit on `/auth/setup`

* Remove useless test
 2025-02-27 15:44:35 +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
524e8992ad Merge commit 'db971976853103017b1561f2c4f9406fa00c0a2e' into glitch-soc/merge-upstream 2025-02-22 21:31:46 +01:00
Matt Jankowski
2a15bf4ede
Convert admin/roles controller spec to request/sytem specs (#33947) 2025-02-21 11:47:47 +00:00
Matt Jankowski
d065d02d88
Improve example wording in 2FA/confirmations controller spec (#33944) 2025-02-21 07:31:06 +00:00
Claire
f3bc50778b Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream 2025-02-18 20:38:57 +01:00
Matt Jankowski
fbea3a64cc
Convert statuses spec controller->system/request (#33921) 2025-02-18 11:43:49 +00:00
Matt Jankowski
ea53faeb3f
Convert admin/users/roles spec controller->system/request (#33930) 2025-02-17 09:25:25 +00:00
Matt Jankowski
8f1b41622b
Convert settings/two_factor_authentication_methods spec controller->system/request (#33914) 2025-02-13 10:50:04 +00:00
Matt Jankowski
62dc303d3c
Convert settings/two_factor_authentication/recovery_codes spec controller->system/request (#33912) 2025-02-13 08:02:01 +00:00
Claire
28d85ede4c Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream 2025-02-12 18:40:21 +01:00
Matt Jankowski
6df24b4bc2
Move signed out statuses controller spec examples to request spec (#33907) 2025-02-12 14:24:03 +00:00
Matt Jankowski
506a70d0d8
Convert "http signatures" portion of statuses controller spec to request spec (#33890) 2025-02-12 08:33:25 +00:00
Matt Jankowski
7d20c12913
Convert settings/featured_tags controller->request/system spec (#33880) 2025-02-11 06:45:34 +00:00
Matt Jankowski
8c240ef042
Remove final remaining assigns usage in controller specs (#33866) 2025-02-10 07:33:36 +00:00
Claire
a417d6f3fc Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/precompute_feed_service.rb`:
  Upstream added an option to skip half-generated timelines.
  We have a conflict because we still maintain upstream's old chronological DM
  timelines.
  Update our code to apply the same logic to the DM timelines.
 2025-02-07 21:21:28 +01:00
Matt Jankowski
23a0d91126
Combine examples to reduce factories in specs (#33841) 2025-02-06 10:54:31 +00:00
Claire
c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `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.
 2025-02-01 19:07:13 +01:00
Matt Jankowski
c5cd9bda48
Convert auth/passwords spec controller->system/request (#33790) 2025-01-31 08:08:56 +00:00
Claire
2d545c5fe5
Fix flaky test in /api/v2/notifications tests (#33773) 2025-01-29 12:49:03 +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
32aa83e9d7
Fix polls not being validated on edition (#33755) 2025-01-28 14:38:18 +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
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