mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
23,542 Commits 2 Branches 16 Tags 298 MiB
Commit Graph

2428 Commits

Author SHA1 Message Date
Emelia Smith aa88aca0ad
Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00
Claire edec2e9fdf Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream 2024-07-14 18:43:35 +02: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
Claire ad52b04a1c
Add setting to disable hover cards (#30931) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-07-11 19:42:58 +00:00
Siph 1d55821032
Merge pull request #52 from glitch-soc/main 
merge upstream
 2024-07-10 09:58:01 +02: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
Claire 6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
Claire d41b43ed4f
Limit attachments to `MEDIA_ATTACHMENTS_LIMIT` when returning posts through the API (#30932) 2024-07-08 07:41:50 +00:00
Alexis Viguié e0205b6825
merge upstream 2024-07-04 18:47:21 +02:00
Claire d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
Eugen Rochko 096057b845
Change `author_account` to be `authors` in REST API (#30846) 2024-06-27 13:17:18 +00:00
Claire 7a84b76bb1
Drop favicon.ico generation (#30375) 2024-06-26 13:44:08 +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 fd867adffe Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream 2024-06-20 18:36:13 +02:00
Claire bb2d77b4a0
Change `/api/v2_alpha/notifications` to only return historical data in pages (#30781) 2024-06-20 15:54:50 +00:00
Claire f723370c69
Fix missing `account_warning` delegation in `NotificationGroup` (#30779) 2024-06-20 13:44:49 +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
Claire 677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Claire 8eb27c60e1
Add `most_recent_notification_id` to `NotificationGroup` (#30707) 2024-06-14 10:33:06 +00:00
Claire 37f53542fe
Fix limit handling in grouped notifications CTE (#30685) 2024-06-13 12:42:40 +00:00
Claire 4daed855e5 Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream 2024-06-11 19:46:11 +02:00
Matt Jankowski d818ddd687
Extract `SIGN_COUNT_LIMIT` constant in `WebauthnCredential` class (#30636) 2024-06-11 15:36:21 +00:00
Matt Jankowski 665f6f09a0
Add expired/revoked scopes for doorkeeper models via extension modules (#29936) 2024-06-11 08:50:51 +00:00
Claire be68f8f4af Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream 2024-06-10 18:20:08 +02:00
Matt Jankowski 9bf2e2eda0
Extract `TEXT_LENGTH_LIMIT` constant in `Appeal` class (#30638) 2024-06-10 15:23:17 +00:00
Claire 7277d2f130 Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream 2024-06-07 20:30:51 +02:00
Alexis Viguié e5aaaf8290
merge upstream 2024-06-07 20:20:28 +02:00
Claire 9e9613b286
Fix `mentions.account_id` and `mentions.status_id` not having `NOT NULL` database constraints (#30591) 2024-06-07 13:45:11 +00:00
Claire 1408733386
Fix Mastodon relying on ImageMagick even with `MASTODON_USE_LIBVIPS` (#30590) 2024-06-07 09:27:59 +00:00
Claire 30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
Eugen Rochko a2505e8611
Add timeline of public posts about a trending link to REST API (#30381) 2024-06-06 08:43:04 +00:00
Emelia Smith 4655be0da6
Fix add validation to webpush subscription keys (#30542) 2024-06-05 19:16:47 +00:00
Eugen Rochko 5f15a892fa
Add support for libvips in addition to ImageMagick (#30090) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-05 19:15:39 +00:00
Emelia Smith eef2cc054f
Add url validation to Web::PushSubscription endpoints (#30540) 2024-06-05 08:06:06 +00:00
Claire 974335e414
Add experimental server-side notification grouping (#29889) 2024-06-03 08:35:59 +00:00
Claire c827a98f19 Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
 2024-05-29 17:03:24 +02:00
Eugen Rochko 128987eded
Add support for `fediverse:creator` OpenGraph tag (#30398) 2024-05-29 01:34:33 +02:00
Matt Jankowski 4a77e477ee
Consolidate account scopes for `LOWER` (index using) username/domain queries (#30451) 2024-05-28 14:11:31 +00:00
Matt Jankowski c61e356475
Add `Status::MEDIA_ATTACHMENTS_LIMIT` configuration constant (#30433) 2024-05-27 09:49:44 +00:00
Claire d76106da12 Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream 2024-05-24 17:08:21 +02:00
Matt Jankowski 9b5055d34d
Fix `Style/SuperArguments` cop (#30406) 2024-05-24 08:36:21 +00:00
Claire edf6ca56e3 Fix rubocop error and cleanup `Status.as_direct_timeline` a little 2024-05-21 13:12:46 +02:00
Claire d3136e6d58 Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream 2024-05-21 12:06:38 +02:00
Claire 89f89d738f
Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385) 2024-05-21 08:56:08 +00:00
Claire e46321e63d Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream 2024-05-20 12:17:36 +02:00
Matt Jankowski def6b686ff
Fix `Rails/WhereRange` cop (#30343) 2024-05-20 09:37:36 +00:00
Claire 57fb2cf948 Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream 2024-05-17 12:33:41 +02:00
Jeong Arm a627219b25
Fix moderation action logs (#30342) 2024-05-17 09:18:54 +00:00
Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.
 2024-05-16 19:30:10 +02:00
Emelia Smith 5fd56512de
Improve Report Notes and Account Moderation Notes (#30288) 2024-05-15 13:38:36 +00:00
Claire 21c904b0f6 Merge commit 'd8c428472356abd70aaf1f514b99114464ee7f61' into glitch-soc/merge-upstream 2024-05-07 20:30:17 +02:00
Claire d8c4284723
Ensure custom favicon is converted to PNG and ICO (#30208) 2024-05-07 18:15:17 +00:00
Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
 2024-05-06 17:53:51 +02:00
Claire 2fe1b8d169
Add API to get multiple accounts and statuses (#27871) 
Co-authored-by: noellabo <noel.yoshiba@gmail.com>
 2024-05-06 15:19:15 +00:00
Fawaz Farid bc24c4792d
Allow admins to configure instance favicon and logo (#30040) 2024-05-06 15:06:52 +00:00
Claire 30ef9fccf0
Fix hashtag matching pattern matching some link anchors (#30190) 2024-05-06 12:47:19 +00:00
Claire e5062b7135
Fix post deletion not being deferred when those are part of an account warning (#30163) 2024-05-06 09:52:34 +00:00
Claire 3789d9f825 Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream 
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests.
 2024-05-04 16:28:30 +02:00
Claire f09f5b35f2 Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.

The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
 2024-05-04 16:12:51 +02:00
Claire a76980a229 Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream 2024-05-04 15:40:07 +02:00
Claire d6f9c97ae4 Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream 2024-05-04 15:24:22 +02:00
Claire bac4026d80 Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream 2024-05-04 15:10:54 +02:00
Râu Cao 9aa31be8d3
Fix local account search on LDAP login being case-sensitive (#30113) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-03 09:22:48 +00:00
Matt Jankowski 88882fbbee
Move Rails/HABTM cop out of todo (#30118) 2024-05-02 09:40:05 +00:00
Matt Jankowski 1e7d5d2957
Update `devise-two-factor` to version 5.0.0 (#28325) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-02 09:31:41 +00:00
Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.
 2024-05-01 19:38:34 +02:00
Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
 2024-05-01 19:30:41 +02:00
Claire 946bd2e7e1 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Claire 6f342a6d4c Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream.
 2024-05-01 18:56:48 +02:00
Claire 9ce82a35cb Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
Claire 0fb469e2f3 Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream 2024-05-01 17:30:52 +02:00
Claire 15f6d2d038 Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Conflict due to glitch-soc having a different default site name.
  Updated the tests as upstream did, keeping glitch-soc's default name.
 2024-05-01 17:22:02 +02:00
Claire 3f61981f5d Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream 2024-05-01 14:50:16 +02:00
Claire 7b46517c38 Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream 2024-05-01 14:31:14 +02:00
Matt Jankowski 924af400da
Remove unused memoization in `CustomFilter#expires_in` method (#30117) 2024-04-29 12:49:31 +00:00
Matt Jankowski ac7f4d57bb
Use composable query in `Status.without_replies` scope (#30086) 2024-04-29 09:55:37 +00:00
Claire 95e9de5777
Prevent accidental serialization of `Account` and `User` records (#30079) 2024-04-29 09:45:58 +00:00
Matt Jankowski bbf1b603e0
Remove unused `Account.popular` scope (#30068) 2024-04-29 09:04:35 +00:00
Matt Jankowski 2123281f7c
Move `Account` limits to constants (#30087) 2024-04-29 09:02:47 +00:00
Matt Jankowski f0c9cbaf3b
Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class (#30088) 2024-04-29 09:01:46 +00:00
Claire e845594878
Fix moderator account being exposed in account moderation notification (#30082) 2024-04-26 12:42:06 +00:00
Claire 4ef0b48b95
Add in-app notifications for moderation actions/warnings (#30065) 2024-04-25 17:26:05 +00:00
Matt Jankowski f4a53f3fb4
Extract constants for column size length validation limits (#30045) 2024-04-24 08:56:28 +00:00
Matt Jankowski 11e0049b08
Use enum-generated scopes/queries for `BulkImport` (#29975) 2024-04-18 10:13:35 +00:00
Matt Jankowski 650c548c31
Add `not_featured_by` scope to Tag (#28815) 2024-04-17 10:05:38 +00:00
Claire fc89ecc6ca
Change `/api/v1/announcements` to return regular `Status` entities (#26736) 2024-04-17 09:06:23 +00:00
Matt Jankowski 6fed108703
Use Rails `upsert` to generate update_count! query in Counters concern (#28738) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-17 08:16:51 +00:00
Matt Jankowski caad1e2628
Add scope `Status.distributable_visibility` (#29950) 2024-04-16 13:16:54 +00:00
Matt Jankowski 6b33d3f81b
Add `CustomFilter.unexpired` scope (#29896) 2024-04-16 09:29:34 +00:00
Matt Jankowski 3159c0a547
Add scope `Status.list_eligible_visibility` (#29951) 2024-04-16 09:17:03 +00:00
Matt Jankowski 13bbde2246
Use existing `DEFAULT_FIELDS_SIZE` constant to limit `Account#fields` (#29911) 2024-04-12 09:04:23 +00:00
Matt Jankowski 285f63c02e
Use composable query in `User.active` scope (#29775) 2024-04-08 13:53:49 +00:00
Claire babbf6017d
Remove caching in `cache_collection` (#29862) 2024-04-08 13:46:13 +00:00
Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
 2024-04-06 21:01:40 +02:00
Claire 777984faeb Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
Claire 903dc53522 Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Claire 67842ffb22 Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream 2024-04-06 19:54:11 +02:00
Claire f2b23aa5f3 Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes.
 2024-04-06 19:35:21 +02:00
Matt Jankowski c0fe8a9f13
Extract shared callback behaviour to `CustomFilterCache` concern (#29695) 2024-04-05 09:17:58 +00:00
Claire 38b9d31f63
Improve email address validation (#29838) 2024-04-05 07:48:45 +00:00
Matt Jankowski f56309f5f0
Add `by_latest_used` scope, move admin area recent IPs to partial (#29497) 2024-04-02 13:51:34 +00:00
Alexis Viguié 69dc2eddb4
merge upstream 2024-03-30 23:35:57 +01:00
Matt Jankowski b016f03637
Pull out constant from `AccountWarning.recent` scope (#29767) 2024-03-27 14:08:04 +00:00
Matt Jankowski 1d0a43f6a3
Use composable query in `Status.not_domain_blocked_by_account` scope (#29766) 2024-03-27 09:59:45 +00:00
Matt Jankowski 32938dadd7
Add `not_allowed` scope for `PreviewCardTrend` (#29599) 2024-03-26 13:21:20 +00:00
Matt Jankowski cf76380c91
Add `AccountStat.by_recent_status`, use in `Account` (#29704) 2024-03-26 13:12:09 +00:00
Emelia Smith eb926b7e60
Ensure case-insensitive fields are converted to lowercase in user imports (#29740) 2024-03-26 09:30:10 +00:00
Emelia Smith a3e8b78250
Ensure case-insensitive fields are converted to lowercase in Admin Imports (#29739) 2024-03-26 09:30:07 +00:00
Claire 37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional (#29373) 2024-03-22 16:24:04 +00:00
Claire 58376eedda
Remove obsolete `admin` and `moderator` columns from `users` table (#29718) 2024-03-22 16:22:36 +00:00
Claire d71d26a3c9
Reattribute notification-related records if possible when merging accounts (#29694) 2024-03-22 16:21:53 +00:00
Claire dfa43707eb
Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately (#29714) 2024-03-22 15:44:31 +00:00
Matt Jankowski 8c1d29df7e
Use `has_many through` instead of `delegate` for ARSE<>SR (#29672) 2024-03-22 14:43:35 +00:00
Matt Jankowski 77897cd24c
Use existing `SeveredRelationship.about_local_account` scope in more places (#29673) 2024-03-21 08:36:49 +00:00
Matt Jankowski cdd168f5d3
Update `enum` away from deprecated (#29678) 2024-03-21 08:32:35 +00:00
Claire 821fc53583 Fix error when attempting to delete posts that triggered a notification request (#29666) 2024-03-20 19:53:20 +01:00
Claire c0aade79b0 Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream 2024-03-20 18:31:09 +01:00
Claire f4d753aedf
Fix error in severed relationship event serializer (#29670) 2024-03-20 17:14:53 +00:00
Claire 98a2bb8be2
Fix issue with severed relationships notifications (#29668) 2024-03-20 17:02:09 +00:00
Claire 954b470fbc
Fix error when attempting to delete posts that triggered a notification request (#29666) 2024-03-20 16:48:24 +00:00
Claire d4449cc682
Fix account_relationship_severance_events unique indexes (#29665) 2024-03-20 16:08:34 +00:00
Claire 44bf7b8128
Add notifications of severed relationships (#27511) 2024-03-20 15:37:21 +00:00
Claire 8a1423a474
Allow unblocking email addresses from any matching account (#29305) 2024-03-20 14:38:00 +00:00
Claire 876aa35350 Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2024-03-19 19:21:12 +01:00
Matt Jankowski 62e266fbd6
Add `BrowserDetection` model concern (#29513) 2024-03-19 15:39:14 +00:00
Claire d5063072c3
Revert friends-of-friends follow recommendation query to using a CTE (#29619) 2024-03-18 12:57:21 +00:00
Claire 2e49bc97b0 Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream 2024-03-15 12:20:32 +01:00
Matt Jankowski 838b0bdf2d
Remove unused `Account::Interactions#endorsed?` method (#29463) 2024-03-15 09:00:26 +00:00
Claire e91ede5be6 Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream 2024-03-14 17:27:16 +01:00
Matt Jankowski 6c3e718b86
Remove setting of `sensitive` value (default false, not null) in Status model (#29589) 2024-03-14 13:56:59 +00:00
Matt Jankowski 14aa7f1e15
Use `Account.activitypub` generated scope (#28157) 2024-03-14 13:19:20 +00:00
Matt Jankowski 0bc17a3d48
Use enum-generated `public_visibility` scope on Status (#28156) 2024-03-14 09:31:57 +00:00
Matt Jankowski 19cbadfbd6
Use enum-generated scope for `IpBlock` in CLI (#28144) 2024-03-14 09:31:15 +00:00
Claire 65ca37bbaa Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Conflict due to glitch-soc having factored the file differently.
  Ported upstream's changes.
 2024-03-13 20:14:18 +01:00
Claire 08b10cce52 Merge commit 'b43eaa4517107326c7e73b949cec759f841b4a30' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/accounts/credentials_controller_spec.rb`
  Conflict due to glitch-soc's different note length handling.
  Ported the changes in `spec/requests/api/v1/accounts/credentials_spec.rb` instead.
 2024-03-13 20:12:58 +01:00
Claire 06881a8669 Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream 2024-03-13 19:16:47 +01:00
Claire c6dbb33944 Merge commit 'd4ed7e466c41f19e5f9352700c76e7ffc4d28119' into glitch-soc/merge-upstream 2024-03-13 18:58:47 +01:00
Claire 27ffc09847 Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream 2024-03-13 18:56:40 +01:00
Matt Jankowski c09b8a7164
Add `Account.without_internal` scope (#29559) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 14:11:23 +00:00
Claire b43eaa4517
Refactor notification filtering behavior definition (#29567) 2024-03-13 10:35:49 +00:00
Matt Jankowski 01b624c4a0
Use `normalizes` on `CustomFilter#context` value (#27602) 2024-03-13 08:50:21 +00:00
Matt Jankowski d4ed7e466c
Extract `by_domain_length` scope in `DomainNormalizable` concern (#29517) 2024-03-12 13:09:11 +00:00
Matt Jankowski 216cea1e27
Fix incorrect frequency value in `FriendsOfFriendsSource` data (#29550) 2024-03-12 08:38:32 +00:00
Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
 2024-03-11 17:29:07 +01:00
Eugen Rochko c10bbf5fe3
Add notification policies and notification requests in web UI (#29433) 2024-03-11 15:02:21 +00:00
Jeong Arm 4a6ddbc9c0
Normalize idna domain before account unblock domain (#29530) 2024-03-11 09:28:08 +00:00
Eugen Rochko 5b3a8737d6
Add hints for rules (#29539) 2024-03-11 08:57:07 +00:00