mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,138 Commits
69 Branches
21 Tags
341 MiB
Commit Graph

3224 Commits (6ac6d8652561cb18fea9ef09c4e1f151fc5e95b4)

Author SHA1 Message Date
Matt Jankowski 02585d8789
Convert `media` controller spec to request spec (#31634) 2024-08-29 08:46:00 +00:00
Matt Jankowski b9269c8d38
Convert `admin/reset` controller spec to system spec (#31643) 2024-08-29 08:38:17 +00:00
Matt Jankowski 0ef636f72d
Convert `shares` controller spec to system spec (#31619) 2024-08-28 07:58:40 +00:00
Matt Jankowski 00586d27cb
Convert `instance_actor` controller spec to request spec (#31621) 2024-08-28 07:56:07 +00:00
Claire 94d8cdc494 Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream 2024-08-27 20:00:07 +02:00
Matt Jankowski 3959f36d19
Add checks about response body content to admin/dash spec (#30716) 2024-08-27 14:59:56 +00:00
Matt Jankowski 48f4e5444d
Convert `media_proxy` controller spec to request spec (#31600) 2024-08-27 09:44:16 +00:00
Matt Jankowski a7f8417795
Convert "CSV export" settings controller specs to request specs (#31601) 2024-08-27 08:12:39 +00:00
Matt Jankowski 38a3466741
Convert `api/oembed` controller spec to request spec (#31605) 2024-08-27 07:55:25 +00:00
Matt Jankowski c09d232ee3
Convert `api/web/settings` controller spec to request spec (#31606) 2024-08-27 07:42:35 +00:00
Matt Jankowski 14d7fe05d0
Use `describe` instead of `context` in top-level spec declaration (#31607) 2024-08-27 07:40:18 +00:00
Claire 8f678a3cf4 Fix tests for glitch-soc 2024-08-26 19:08:42 +02:00
Claire 11b8017b45 Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream 2024-08-26 18:52:33 +02:00
Matt Jankowski 4c2534d12e
Convert "static page" controller specs to system specs (#31599) 2024-08-26 15:53:48 +00:00
Matt Jankowski dbe0ee8a81
Convert `emojis` controller spec to request spec (#31597) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-08-26 15:00:05 +00:00
Matt Jankowski 5172d84946
Convert `manifest` controller spec to request spec (#31596) 2024-08-26 14:37:23 +00:00
Matt Jankowski 36ccdcc9e1
Convert "custom css" controller spec to request spec (#31595) 2024-08-26 14:36:31 +00:00
Matt Jankowski 641ae6a2cf
Convert health check endpoint controller spec to request spec (#31565) 2024-08-26 12:17:35 +00:00
Matt Jankowski bcc4b1078c
Fix `Rails/RootPathnameMethods` cop (#31582) 2024-08-26 07:35:07 +00:00
Claire d0529b810a Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream 2024-08-24 12:06:31 +02:00
David Roetzel 0374918746
Add spec for doorkeeper behavior around issuing tokens (#31545) 2024-08-23 08:20:32 +00:00
Claire 18556d3e9b Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream refactored some helpers and moved them in another file.
  Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
  Kept glitch-soc definitions where they are and moved upstream ones
  as upstream did.
 2024-08-22 19:54:20 +02:00
Renaud Chaput 4a968cb7a9
Add `icon` field to instance endpoint (#30205) 2024-08-22 10:04:27 +00:00
Claire 0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Upstream added a test for a new attribute, next to a line we modified
  in glitch-soc because of a different default value.
  Updated as upstream's did, keeping glitch-soc's default value.
 2024-08-21 18:44:21 +02:00
Claire 19a1acb38b
Add `api_versions` to `/api/v2/instance` (#31354) 2024-08-21 14:54:59 +00:00
Claire f5c0c32edd Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
  Glitch-soc used this one but not upstream.
  Upstream pulled a presumably more up-to-date version of the file.
  Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/error.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
 2024-08-20 18:31:50 +02:00
Matt Jankowski f91403ccaa
Remove unused `fa_icon` helper method (#31511) 2024-08-20 15:59:59 +00:00
Claire 711e1fce0a
Fix pagination parameters in `GET /api/v2_alpha/notificatins` (#31509) 2024-08-20 13:54:08 +00:00
Matt Jankowski fa2e7b1708
Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
Claire 1760f84349 Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream 2024-08-19 18:25:31 +02:00
Claire 53c183f899
Reload notifications when accepted notifications are merged (streaming only) (#31419) 2024-08-19 15:59:06 +00:00
Edward Moulsdale d4f135bc6d
Fix in memoriam accounts appearing in follow recommendations (#31474) 
Co-authored-by: Utkarsh Wankar <46633523+kernal053@users.noreply.github.com>
 2024-08-19 15:55:42 +00:00
Claire d2e4be0456
Hopefully fix notifications pagination flaky test (#31494) 2024-08-19 14:53:54 +00:00
Claire 9f2775830c Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-soc/merge-upstream 2024-08-15 21:58:04 +02:00
Renaud Chaput 5d04e29775
Disable Chrome's search engine selection screen when running system specs (#31437) 2024-08-15 06:45:00 +00:00
Renaud Chaput 4545b8d6cb
Add the ability to ignore specific browser errors for a spec (#31436) 2024-08-15 06:44:13 +00:00
Claire 169b35869f Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream 2024-08-14 21:17:43 +02:00
Jeong Arm 95c11d365d
Don't push to cache buster if attachment path is nil (#31414) 2024-08-14 08:57:42 +00:00
Claire 7996a9543d
Change notification request acceptance to immediately delete the request (#31256) 2024-08-14 07:34:30 +00:00
Renaud Chaput c3e1d86d58
Fix log out from user menu not working on Safari (#31402) 2024-08-13 17:49:23 +00:00
Matt Jankowski 02df1b4e4a
Finish email allow/deny list naming migration (#30530) 2024-08-13 07:37:32 +00:00
Claire 31a00c0c1a Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream 2024-08-09 17:15:32 +02:00
Claire 8a5b57f668
Revert "Support JSON-LD named graph (#31288)" (#31355) 2024-08-09 13:48:54 +00:00
Claire cbdd8edf68
Revamp notification policy options (#31343) 2024-08-09 13:30:55 +00:00
Claire 994ef16b72
Bust CDN cache on media deletion (#31353) 2024-08-09 12:48:34 +00:00
Claire dd2a991e24 Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
  Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
  Glitch-soc had extra menu items, ported the changes for them too.
 2024-08-08 19:30:16 +02:00
Matt Jankowski 52a626f39b
Replace more `font-awesome` icons in `app/helpers` (#30962) 2024-08-07 22:53:15 +00:00
Claire 06e034db15 Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream 2024-08-07 19:22:25 +02:00
Claire 670e4655d1
Change dismissing a notification to clear existing filtered notifications for that account (#31329) 2024-08-07 15:14:37 +00:00
Claire af2aec1a82
Change notification requests to only count mentions (#31322) 2024-08-07 11:12:36 +00:00
Claire 719cabe024
Fix logic of block/mute bypass for mentions from moderators (#31271) 2024-08-07 06:52:10 +00:00
Claire 08adca0c63 Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream 2024-08-06 17:27:48 +02:00
Claire 438dac99d6
Add option to request partial accounts in grouped notifications API (#31299) 2024-08-06 12:09:35 +00:00
Christian Schmidt 9d0cafd06b
Check Content-Length in ResponseWithLimitAdapter (#31285) 2024-08-06 08:23:48 +00:00
Christian Schmidt e9e63ed203
Support JSON-LD named graph (#31288) 2024-08-06 07:52:47 +00:00
Claire e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
 2024-08-02 18:09:48 +02:00
Claire da5b45a573
Add endpoints to accept and dismiss multiple notification requests at once (#31242) 2024-08-01 12:36:54 +00:00
Claire 8dd671a977 Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream 2024-07-31 18:16:01 +02:00
Claire 549ab089ee
Change grouped notifications API shape (take 2) (#31214) 2024-07-31 10:50:13 +00:00
Claire 1f796d129d Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
  Ported upstream changes.
 2024-07-30 20:47:34 +02:00
Claire 598ae4f2da
Add endpoints for unread notifications count (#31191) 2024-07-30 08:39:11 +00:00
Tim Rogers 2ce99c51dd
Fixed Rails route covering %40-encoded profile URL paths to not 404 (#31184) 2024-07-30 08:18:00 +00:00
Claire 654187a995 Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
Emelia Smith c40e481169
Implement UI for Admin Search of Hashtags (#30880) 2024-07-29 15:49:44 +00:00
Matt Jankowski 95eadabe44
Extrude `fill_in_auth_details` method to `ProfileStories` spec support module (#31163) 2024-07-29 08:31:42 +00:00
Claire fb411b6d0f Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream 2024-07-27 13:19:38 +02:00
David Roetzel dd53792714
Move UI tests from controller to system spec (#31158) 2024-07-26 14:53:49 +00:00
Emelia Smith 693d9b03ed
Enable OAuth PKCE Extension (#31129) 2024-07-26 08:53:10 +00:00
Claire cf5d2c3fe4 Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream 2024-07-25 17:47:02 +02:00
Adam Niedzielski 887e64efd4
Allow @ at the end of an URL (#31124) 2024-07-25 15:02:58 +00:00
Adam Niedzielski fbf95216c5
Fix LinkCrawlWorker NoMethodError: undefined method `[]' for nil (#31144) 2024-07-25 14:51:44 +00:00
Matt Jankowski bfaa53343a
Improve failure message on pagination matcher (#31146) 2024-07-25 14:28:08 +00:00
Adam Niedzielski 337a7fcf30
Fix ß bug in regexp for mentions and tags (#31122) 2024-07-25 14:24:19 +00:00
Matt Jankowski e881a59671
Add `User.unconfirmed` scope, reduce factories in `scheduler/user_cleanup` spec (#31063) 2024-07-25 14:18:24 +00:00
Claire 68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Adam Niedzielski cd0ca4b994
Select correct self link when parsing Webfinger response (#31110) 2024-07-23 14:42:31 +00:00
Emelia Smith bb2e5a4b58
Add audit logs to Admin::InstancesController (#27386) 2024-07-23 08:12:30 +00:00
Claire 2aac73341a Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Conflict due to glitch-soc's local-only posts.
  Ported upstream's changes while keeping glitch-soc's feature.
 2024-07-22 17:38:30 +02:00
Claire ced5e853c7
Fix duplicate `orderedItems` in user archive's `outbox.json` (#31099) 2024-07-22 08:56:05 +00:00
Matt Jankowski 6e4305de69
Fix spec descriptions around configurable limit values (#31079) 2024-07-22 08:02:31 +00:00
Matt Jankowski ef796446e5
Ignore manifest JS parse/interrupt error on CI (#31080) 2024-07-22 07:46:41 +00:00
Claire f7598b267b Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
kyori19 3a00f89aa1
Respect `Account::DISPLAY_NAME_LENGTH_LIMIT` in account spec correctly (#31075) 2024-07-19 15:31:48 +00:00
Matt Jankowski 05342529dd
Reduce factory creation in AP activity move spec (#31064) 2024-07-19 08:31:34 +00:00
Claire c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
Matt Jankowski 848b59c8ae
Reduce factory creation in `MediaAttachment` model spec (#31058) 2024-07-18 15:23:46 +00:00
Matt Jankowski 47ea83d246
Reduce factory creation in `AP::ProcessStatusUpdateService` spec (#31051) 2024-07-18 08:00:19 +00:00
Matt Jankowski 2616fde9e6
Use change-requiring records in admin/reports controller spec (#31052) 2024-07-18 07:49:44 +00:00
Matt Jankowski c5f8256801
Reduce extra factories in `FanOutOnWriteService` spec (#31053) 2024-07-18 07:45:59 +00:00
Claire 5e7720d11b Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream 2024-07-17 22:20:12 +02:00
Matt Jankowski 76c2c5c748
Reduce extra round trips in `activitypub` controller specs (#31041) 2024-07-17 08:09:34 +00:00
Matt Jankowski f5e90f3de3
Reduce extra round trips in `AP::SynchronizeFollowersService` spec (#31044) 2024-07-17 07:33:08 +00:00
Matt Jankowski 81877e7950
Reduce extra round trips in `AP::FetchRemoteStatusService` spec (#31045) 2024-07-17 07:24:14 +00:00
Claire c546757cd1 Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream 2024-07-16 17:54:36 +02:00
Emelia Smith aa88aca0ad
Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00
Claire 64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.
 2024-07-15 18:51:38 +02:00
Matt Jankowski 91ef4a6fc5
Add assertion about key columns to account key generate spec (#30635) 2024-07-15 10:42:18 +00:00
Claire 1dd8262071
Add optional `filtered` attribute to notification entities in REST API (#31011) 2024-07-15 09:29:57 +00:00
Claire edec2e9fdf Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream 2024-07-14 18:43:35 +02:00
Matt Jankowski 00cb4a0313
Avoid repeated factory creation in media_attachments_vacuum_spec (#31000) 2024-07-12 14:09:16 +00:00
David Roetzel 35a437a03f
Destroy `NotificationRequest`s that are dismissed (#31008) 2024-07-12 12:09:52 +00:00
Claire 55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
Matt Jankowski 43e24dbb13
Use `include_pagination_headers` in more places (#30999) 2024-07-12 08:30:52 +00:00
Matt Jankowski 73d53827ea
Add change assertion to invites destroy spec (#31004) 2024-07-12 08:19:15 +00:00
Claire 52fb4f16ef Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream 2024-07-10 16:58:06 +02:00
David Roetzel 2ea9336b68
Do not pass unknown encoding names to nokogiri. (#30987) 2024-07-10 14:25:39 +00:00
Claire 388672ff0d Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream 2024-07-09 20:39:09 +02:00
David Roetzel 967505ee9b
Add size limit for all PreviewCard URLs (#30973) 2024-07-09 13:11:34 +00:00
Daniel M Brasil 3875bd138d
Fix HTTP 500 in `/api/v1/polls/:id/votes` (#25598) 2024-07-09 12:41:49 +00:00
Claire 6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
David Roetzel fa8e972722
Fix author names as arrays in linked data. (#30957) 2024-07-08 16:04:36 +00:00
Matt Jankowski f1300ad284
Rename jobs/attachments rspec tag names (#29762) 2024-07-08 16:01:08 +00:00
Claire d41b43ed4f
Limit attachments to `MEDIA_ATTACHMENTS_LIMIT` when returning posts through the API (#30932) 2024-07-08 07:41:50 +00:00
Claire 11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.
 2024-07-06 21:02:42 +02:00
David Roetzel 97eddb5906
Fix details extraction when no title exists. (#30933) 2024-07-05 13:28:52 +00:00
David Roetzel 016c1e4e78
Improve handling of encoding problems when creating link previews (#30929) 2024-07-05 11:54:38 +00:00
Claire e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly.
 2024-07-04 17:12:14 +02:00
Claire 502cf75b16
Merge pull request from GHSA-58x8-3qxw-6hm7 
* Fix insufficient permission checking for public timeline endpoints

Note that this changes unauthenticated access failure code from 401 to 422

* Add more tests for public timelines

* Require user token in `/api/v1/statuses/:id/translate` and `/api/v1/scheduled_statuses`
 2024-07-04 16:26:49 +02:00
Claire 395f17ca17
Merge pull request from GHSA-vp5r-5pgw-jwqx 
* Fix streaming sessions not being closed when revoking access to an app

* Add tests for GHSA-7w3c-p9j8-mq3x
 2024-07-04 16:11:28 +02:00
Emelia Smith 47f0faebc9
Implement HTML ruby tags for east-asian languages (#30897) 2024-07-03 20:05:59 +00:00
David Roetzel 9be77fc0db
Revert "Add system check for missing database indexes" (#30909) 2024-07-03 13:36:42 +00:00
David Roetzel ebd8e1bbb6
Add system check for missing database indexes (#30888) 2024-07-03 07:19:54 +00:00
Claire d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
Matt Jankowski 836c0477ac
Use vips setting instead of env var in media processing spec (#30859) 2024-06-27 16:03:26 +00:00
David Roetzel ff08d99d4d
Catch encoding errors when creating link previews. (#30853) 2024-06-27 14:41:03 +00:00
David Roetzel 42adb6eaee
Add size limit for link preview URLs (#30854) 2024-06-27 14:40:19 +00:00
Matt Jankowski f6390c3326
Use flatware to parallelize CI specs (#30284) 2024-06-27 07:42:57 +00:00
Claire 7a84b76bb1
Drop favicon.ico generation (#30375) 2024-06-26 13:44:08 +00:00
Claire 6f2771cb32 Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream 2024-06-25 17:57:39 +02:00
Matt Jankowski 8ef59729a1
Ignore intermittent chrome/manifest/icon interaction failure (#30793) 2024-06-25 13:57:40 +00:00
Emelia Smith 30ae5952d2
Fix: Ensure "With Media" is highlighted from Admin Accounts page (#30812) 2024-06-25 07:46:53 +00:00
Claire 21ca03581a Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream 2024-06-24 19:39:42 +02:00
Claire 8827cd597e
Fix `/admin/accounts/:account_id/statuses/:id` for edited posts with media attachments (#30819) 2024-06-24 13:11:10 +00:00
Claire 3b4607991d Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream 2024-06-22 20:59:23 +02:00
Matt Jankowski 72484a194f
Remove `CacheBuster` default options (#30718) 2024-06-21 15:32:49 +00:00
David Roetzel 2cab1c7b09
Improve encoding detection for link cards (#30780) 2024-06-21 12:51:10 +00:00
Claire cabd7c21fc Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream 2024-06-19 19:37:37 +02:00
Matt Jankowski 84a31319e9
Add `match_json_values` and use in AP worker specs (#30720) 2024-06-19 13:46:52 +00:00
Claire 52e34a6bd6 Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream 2024-06-19 11:59:06 +02:00
Claire 8098d27f84
Stop calling Webpacker in full-stack tests (#30763) 2024-06-19 09:31:30 +00:00
Claire b0c979af49 Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream 2024-06-18 18:20:36 +02:00
Claire 58ace2e45e
Fix SQL error in admin measures API (#30753) 2024-06-18 16:04:58 +00:00
Matt Jankowski 38c6825eda
Remove unused `Extractor#extract_cashtags_with_indices` method (#30742) 2024-06-18 12:16:16 +00:00
Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
 2024-06-17 18:30:28 +02:00
Matt Jankowski d7b7617321
Use `class_names` in admin/account_moderation_notes helper (#30719) 2024-06-17 12:20:57 +00:00
Claire 677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Matt Jankowski f287462f76
Fix repeated Delete/Undo assertion in remove status service spec (#30715) 2024-06-17 10:21:29 +00:00
Claire 45abddb302
Fix pagination attributes not being returned in ungroupable-only pages (#30688) 2024-06-13 14:10:34 +00:00
Claire bf56e982a9
Fix notifications from limited users being outright dropped (#30559) 2024-06-12 13:50:38 +00:00
Claire 1dfd516284
Fix duplicate `@context` attribute in user export (#30653) 2024-06-12 07:28:28 +00:00