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
3f61981f5d
Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream
2024-05-01 14:50:16 +02:00
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
924af400da
Remove unused memoization in `CustomFilter#expires_in` method ( #30117 )
2024-04-29 12:49:31 +00:00
ac7f4d57bb
Use composable query in `Status.without_replies` scope ( #30086 )
2024-04-29 09:55:37 +00:00
95e9de5777
Prevent accidental serialization of `Account` and `User` records ( #30079 )
2024-04-29 09:45:58 +00:00
bbf1b603e0
Remove unused `Account.popular` scope ( #30068 )
2024-04-29 09:04:35 +00:00
2123281f7c
Move `Account` limits to constants ( #30087 )
2024-04-29 09:02:47 +00:00
f0c9cbaf3b
Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class ( #30088 )
2024-04-29 09:01:46 +00:00
e845594878
Fix moderator account being exposed in account moderation notification ( #30082 )
2024-04-26 12:42:06 +00:00
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
f4a53f3fb4
Extract constants for column size length validation limits ( #30045 )
2024-04-24 08:56:28 +00:00
11e0049b08
Use enum-generated scopes/queries for `BulkImport` ( #29975 )
2024-04-18 10:13:35 +00:00
650c548c31
Add `not_featured_by` scope to Tag ( #28815 )
2024-04-17 10:05:38 +00:00
fc89ecc6ca
Change `/api/v1/announcements` to return regular `Status` entities ( #26736 )
2024-04-17 09:06:23 +00:00
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
caad1e2628
Add scope `Status.distributable_visibility` ( #29950 )
2024-04-16 13:16:54 +00:00
6b33d3f81b
Add `CustomFilter.unexpired` scope ( #29896 )
2024-04-16 09:29:34 +00:00
3159c0a547
Add scope `Status.list_eligible_visibility` ( #29951 )
2024-04-16 09:17:03 +00:00
13bbde2246
Use existing `DEFAULT_FIELDS_SIZE` constant to limit `Account#fields` ( #29911 )
2024-04-12 09:04:23 +00:00
285f63c02e
Use composable query in `User.active` scope ( #29775 )
2024-04-08 13:53:49 +00:00
babbf6017d
Remove caching in `cache_collection` ( #29862 )
2024-04-08 13:46:13 +00:00
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
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
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
c0fe8a9f13
Extract shared callback behaviour to `CustomFilterCache` concern ( #29695 )
2024-04-05 09:17:58 +00:00
38b9d31f63
Improve email address validation ( #29838 )
2024-04-05 07:48:45 +00:00
f56309f5f0
Add `by_latest_used` scope, move admin area recent IPs to partial ( #29497 )
2024-04-02 13:51:34 +00:00
b016f03637
Pull out constant from `AccountWarning.recent` scope ( #29767 )
2024-03-27 14:08:04 +00:00
1d0a43f6a3
Use composable query in `Status.not_domain_blocked_by_account` scope ( #29766 )
2024-03-27 09:59:45 +00:00
32938dadd7
Add `not_allowed` scope for `PreviewCardTrend` ( #29599 )
2024-03-26 13:21:20 +00:00
cf76380c91
Add `AccountStat.by_recent_status`, use in `Account` ( #29704 )
2024-03-26 13:12:09 +00:00
eb926b7e60
Ensure case-insensitive fields are converted to lowercase in user imports ( #29740 )
2024-03-26 09:30:10 +00:00
a3e8b78250
Ensure case-insensitive fields are converted to lowercase in Admin Imports ( #29739 )
2024-03-26 09:30:07 +00:00
37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional ( #29373 )
2024-03-22 16:24:04 +00:00
58376eedda
Remove obsolete `admin` and `moderator` columns from `users` table ( #29718 )
2024-03-22 16:22:36 +00:00
d71d26a3c9
Reattribute notification-related records if possible when merging accounts ( #29694 )
2024-03-22 16:21:53 +00:00
dfa43707eb
Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately ( #29714 )
2024-03-22 15:44:31 +00:00
8c1d29df7e
Use `has_many through` instead of `delegate` for ARSE<>SR ( #29672 )
2024-03-22 14:43:35 +00:00
77897cd24c
Use existing `SeveredRelationship.about_local_account` scope in more places ( #29673 )
2024-03-21 08:36:49 +00:00
cdd168f5d3
Update `enum` away from deprecated ( #29678 )
2024-03-21 08:32:35 +00:00
821fc53583
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 19:53:20 +01:00
c0aade79b0
Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream
2024-03-20 18:31:09 +01:00
f4d753aedf
Fix error in severed relationship event serializer ( #29670 )
2024-03-20 17:14:53 +00:00
98a2bb8be2
Fix issue with severed relationships notifications ( #29668 )
2024-03-20 17:02:09 +00:00
954b470fbc
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 16:48:24 +00:00
d4449cc682
Fix account_relationship_severance_events unique indexes ( #29665 )
2024-03-20 16:08:34 +00:00
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
8a1423a474
Allow unblocking email addresses from any matching account ( #29305 )
2024-03-20 14:38:00 +00:00
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
62e266fbd6
Add `BrowserDetection` model concern ( #29513 )
2024-03-19 15:39:14 +00:00
d5063072c3
Revert friends-of-friends follow recommendation query to using a CTE ( #29619 )
2024-03-18 12:57:21 +00:00
2e49bc97b0
Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream
2024-03-15 12:20:32 +01:00
838b0bdf2d
Remove unused `Account::Interactions#endorsed?` method ( #29463 )
2024-03-15 09:00:26 +00:00
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
6c3e718b86
Remove setting of `sensitive` value (default false, not null) in Status model ( #29589 )
2024-03-14 13:56:59 +00:00
14aa7f1e15
Use `Account.activitypub` generated scope ( #28157 )
2024-03-14 13:19:20 +00:00
0bc17a3d48
Use enum-generated `public_visibility` scope on Status ( #28156 )
2024-03-14 09:31:57 +00:00
19cbadfbd6
Use enum-generated scope for `IpBlock` in CLI ( #28144 )
2024-03-14 09:31:15 +00:00
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
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
06881a8669
Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
c6dbb33944
Merge commit 'd4ed7e466c41f19e5f9352700c76e7ffc4d28119' into glitch-soc/merge-upstream
2024-03-13 18:58:47 +01:00
27ffc09847
Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream
2024-03-13 18:56:40 +01:00
c09b8a7164
Add `Account.without_internal` scope ( #29559 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 14:11:23 +00:00
b43eaa4517
Refactor notification filtering behavior definition ( #29567 )
2024-03-13 10:35:49 +00:00
01b624c4a0
Use `normalizes` on `CustomFilter#context` value ( #27602 )
2024-03-13 08:50:21 +00:00
d4ed7e466c
Extract `by_domain_length` scope in `DomainNormalizable` concern ( #29517 )
2024-03-12 13:09:11 +00:00
216cea1e27
Fix incorrect frequency value in `FriendsOfFriendsSource` data ( #29550 )
2024-03-12 08:38:32 +00:00
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
c10bbf5fe3
Add notification policies and notification requests in web UI ( #29433 )
2024-03-11 15:02:21 +00:00
4a6ddbc9c0
Normalize idna domain before account unblock domain ( #29530 )
2024-03-11 09:28:08 +00:00
5b3a8737d6
Add hints for rules ( #29539 )
2024-03-11 08:57:07 +00:00
d09ab957d4
Remove duplicate `captcha_enabled` key in `app/models/form/admin_settings.rb`
2024-03-08 11:38:01 +01:00
50b17f7e10
Add notification policies and notification requests ( #29366 )
2024-03-07 14:53:37 +00:00
45e56db8e4
Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept our version.
2024-03-05 16:25:50 +01:00
ee8d0b9447
Fix follow suggestions potentially including silenced or blocked accounts ( #29306 )
2024-03-04 06:35:20 +00:00
159e500749
Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream
2024-03-01 18:34:48 +01:00
934cab7508
New welcome email ( #28883 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-03-01 12:16:53 +00:00
f01605c665
Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.tsx`:
Changes applied to `app/javascript/core/admin.ts` instead.
2024-03-01 13:02:59 +01:00
3389c41b58
Move `nobody` position in `UserRole` magic number to constant ( #29465 )
2024-03-01 11:05:24 +00:00
67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
2024-02-26 17:43:16 +01:00
8429d07454
Add `RankedTrend` concern for trends classes ( #29388 )
2024-02-26 13:45:39 +00:00
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
0ef44ee720
Move `AccountSuggestions::Source` subclasses default limit value to constant ( #29282 )
2024-02-20 09:21:49 +00:00
785e2f9399
Add scope `providing_styles` to `UserRole` ( #29286 )
2024-02-20 09:18:05 +00:00
245064bb98
Move "everyone" role and "instance actor" account magic number IDs to constants ( #29260 )
2024-02-19 11:09:43 +00:00
cfadb87077
Update enum syntax to use the new Rails 7.0 style ( #29217 )
2024-02-16 14:54:23 +00:00
53b73ed6a2
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:25:15 +01:00
436419cc2f
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:25:15 +01:00
b31af34c97
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:16:07 +01:00
68eaa804c9
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:15:34 +01:00
b83076647e
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 20:03:00 +01:00
e8b66a0525
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 17:14:49 +00:00
541cbdd963
Add env variable support for number of followable hashtags in feed column ( #2500 )
...
* Add env variable support for number of followable hashtags in feed column.
* Add a note about performance concerns for higher values.
See discussion in https://github.com/glitch-soc/mastodon/pull/2500
* Update .devcontainer/docker-compose.yml
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-06 20:23:36 +01:00
Claire
Matt Jankowski
Emelia Smith
Eugen Rochko
Jeong Arm
HTeuMeuLeu
Wolfgang Fournès
JS Moore