2496 commits

Author	SHA1	Message	Date
Matt Jankowski	13bbde2246	Use existing DEFAULT_FIELDS_SIZE constant to limit Account#fields (#29911)	2024-04-12 09:04:23 +00:00
Jeremy Kescher	2df3b9f803	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/serializers/initial_state_serializer.rb	2024-04-11 21:50:48 +02: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
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
Jeremy Kescher	0353a3d759	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx # app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/features/ui/components/navigation_panel.jsx	2024-03-20 22:59:13 +01: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
Jeremy Kescher	a53f2cf970	Merge branch 'glitch-soc' into develop	2024-03-19 18:31:27 +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
Jeremy Kescher	21a23b58ab	Merge branch 'glitch-soc' into develop	2024-03-14 21:46:57 +01:00
Jeremy Kescher	caccc2e0f4	Merge branch 'glitch-soc' into develop ... # Conflicts: # README.md # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/reducers/compose.js # app/javascript/flavours/glitch/styles/components.scss # app/javascript/mastodon/reducers/compose.js # app/models/notification.rb	2024-03-14 20:01:30 +01: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
Claire	d09ab957d4	Remove duplicate captcha_enabled key in app/models/form/admin_settings.rb	2024-03-08 11:38:01 +01:00
Eugen Rochko	50b17f7e10	Add notification policies and notification requests (#29366)	2024-03-07 14:53:37 +00:00
Claire	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
Claire	ee8d0b9447	Fix follow suggestions potentially including silenced or blocked accounts (#29306)	2024-03-04 06:35:20 +00:00
Jeremy Kescher	6aa17a7c1b	Merge branch 'glitch-soc' into develop	2024-03-03 03:12:37 +01:00
Claire	159e500749	Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream	2024-03-01 18:34:48 +01:00
HTeuMeuLeu	934cab7508	New welcome email (#28883) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2024-03-01 12:16:53 +00:00
Claire	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
Matt Jankowski	3389c41b58	Move nobody position in UserRole magic number to constant (#29465)	2024-03-01 11:05:24 +00:00
Jeremy Kescher	de1e89f42c	Merge branch 'glitch-soc' into develop	2024-02-28 23:01:31 +01:00
Claire	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
Matt Jankowski	8429d07454	Add RankedTrend concern for trends classes (#29388)	2024-02-26 13:45:39 +00:00
Jeremy Kescher	009251a17d	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/initial_state.js # app/serializers/initial_state_serializer.rb # config/initializers/chewy.rb # config/locales/en.yml # config/locales/ja.yml	2024-02-24 19:11:05 +01:00
Claire	d2cfc6e5e2	Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream	2024-02-24 15:02:28 +01:00
Claire	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
Claire	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
Claire	5b9ddfcfcc	Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream	2024-02-24 14:18:16 +01:00
noellabo	d518f06eae	Add reject blurhash to Admin setting	2024-02-24 11:14:32 +01:00
Matt Jankowski	0ef44ee720	Move AccountSuggestions::Source subclasses default limit value to constant (#29282)	2024-02-20 09:21:49 +00:00
Matt Jankowski	785e2f9399	Add scope providing_styles to UserRole (#29286)	2024-02-20 09:18:05 +00:00
Matt Jankowski	245064bb98	Move "everyone" role and "instance actor" account magic number IDs to constants (#29260)	2024-02-19 11:09:43 +00:00
noellabo	5255bd08e0	Add reject pattern to Admin setting (Ported to Glitch Soc) ... # Conflicts: # app/views/admin/settings/shared/_links.html.haml # config/routes/admin.rb	2024-02-17 18:55:57 +01:00
Wolfgang Fournès	cfadb87077	Update enum syntax to use the new Rails 7.0 style (#29217)	2024-02-16 14:54:23 +00:00
Jeremy Kescher	1c9291adcd	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/styles/components/accounts.scss # app/javascript/flavours/glitch/styles/components/status.scss	2024-02-14 18:02:38 +01:00
Claire	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
Emelia Smith	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
Claire	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
Emelia Smith	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
Emelia Smith	b83076647e	Ignore legacy moderator and admin columns on User model (#29188)	2024-02-13 20:03:00 +01:00
Emelia Smith	e8b66a0525	Ignore legacy moderator and admin columns on User model (#29188)	2024-02-13 17:14:49 +00:00
Essem	4cbaf46950	Hydrate reactions on streaming API	2024-02-11 17:25:53 +01:00
Jeremy Kescher	40ef7b3849	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/serializers/initial_state_serializer.rb	2024-02-06 22:58:23 +01:00
JS Moore	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	7ee93b7431	Change source attribute of Suggestion entity in /api/v2/suggestions back to a string (#29108)	2024-02-06 17:10:17 +00:00
Claire	66dda7c762	Fix already-invalid reports failing to resolve (#29027)	2024-02-06 09:35:27 +00:00
Matt Jankowski	86500e3312	Extract scenic view model common methods to concern (#28111)	2024-02-06 09:08:07 +00:00
Eugen Rochko	fa0ba67753	Change materialized views to be refreshed concurrently to avoid locks (#29015)	2024-01-30 18:21:30 +00:00
Eugen Rochko	c4af668e5c	Fix follow recommendations for less used languages (#29017)	2024-01-30 17:24:40 +00:00
Jeremy Kescher	bf4d613731	Merge branch 'glitch-soc' into develop	2024-01-28 17:56:47 +01:00
Jeremy Kescher	c2c2afc294	Merge branch 'glitch-soc' into develop	2024-01-28 02:29:46 +01:00
Essem	ae854b8027	Port three new emoji reaction PR commits to Catstodon: ... "Update reaction emails Reaction icon made by @t3rminus@calamity.world" "Simplify reactions API controller" "Refactor status reactions query This was done to announcement reactions in 1b0cb3b54d. Might as well do it here too."	2024-01-28 02:22:43 +01:00
Claire	bf153b384b	Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/auth/passwords_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict.	2024-01-27 19:06:41 +01:00
Claire	5fa2821853	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	2024-01-26 20:47:20 +01:00
Claire	70de52c297	Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream	2024-01-25 19:51:19 +01:00
Matt Jankowski	42ab855b23	Add specs for Instance model scopes and add with_domain_follows scope (#28767)	2024-01-25 15:28:27 +00:00
Matt Jankowski	6b6586f5d0	Add CustomFilterKeyword#to_regex method (#28893)	2024-01-25 13:00:34 +00:00
Claire	22cfab0ebf	Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream ... Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.	2024-01-24 20:42:53 +01:00
Matt Jankowski	38f7f8b909	Tidy up association declaration in Instance model (#28880)	2024-01-24 17:30:28 +00:00
Matt Jankowski	7a1f087659	Add created_before and updated_before scopes to MediaAttachment (#28869)	2024-01-24 10:32:54 +00:00
Matt Jankowski	9d413cbaf8	Fix Rails/WhereExists cop in app/models (#28863)	2024-01-24 09:57:49 +00:00
Matt Jankowski	599bc69503	Simplify AccountSummary.filtered query generation (#28868)	2024-01-24 09:57:32 +00:00
Eugen Rochko	5b1eb09d54	Add annual reports for accounts (#28693)	2024-01-24 09:38:10 +00:00
Matt Jankowski	c0e8e457ab	Eager loading fixes for api/ controllers (#28848)	2024-01-23 11:41:54 +00:00
Matt Jankowski	b0207d7757	Add coverage for Tag.recently_used scope (#28850)	2024-01-23 09:10:11 +00:00
Claire	102eff7c05	Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream	2024-01-22 19:19:40 +01:00
Claire	0700eb58bc	Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream	2024-01-22 19:12:05 +01:00
Matt Jankowski	18004bf227	Add Account.matches_uri_prefix scope and use in activitypub/followers_synchronizations controller (#28820)	2024-01-22 13:55:37 +00:00
Matt Jankowski	5fc4ae7c5f	Move privacy policy into markdown file (#28699)	2024-01-19 11:22:23 +00:00
Matt Jankowski	1480573c83	Add Account.auditable scope, fix N+1 in admin/action_logs#index (#28812)	2024-01-19 01:39:30 +00:00
Jeremy Kescher	93ae46fa14	Merge branch 'glitch-soc' into develop	2024-01-18 22:59:27 +01:00
Claire	528a8fa495	Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream	2024-01-18 22:16:16 +01:00
Matt Jankowski	f866413e72	Extract shared tagged statuses method in FeaturedTag (#28805)	2024-01-18 16:14:15 +00:00
Matt Jankowski	d0b3bc23d7	Remove unused matches_domain scopes on Account, DomainAllow, DomainBlock (#28803)	2024-01-18 16:11:04 +00:00
Matt Jankowski	0b853678a4	Add coverage for api/v1/peers/search endpoint and extract controller query to Instance scope (#28796)	2024-01-18 15:57:10 +00:00
Matt Jankowski	9fb9ef418a	Fix Rails/WhereExists cop in User model (#28792)	2024-01-18 13:55:44 +00:00
Matt Jankowski	aaa6f2e930	Group common class_name options in associations (#28779)	2024-01-18 12:29:41 +00:00
Matt Jankowski	da31792ac7	Fix Rails/WhereExists cop in FeaturedTag model (#28791)	2024-01-18 12:22:12 +00:00
Matt Jankowski	89c9a4502d	Fix Rails/WhereExists cop in account/interactions concern (#28789)	2024-01-18 09:36:16 +00:00
Jeremy Kescher	5d4cfe4cd8	Merge branch 'glitch-soc' into develop	2024-01-17 22:37:29 +01:00
Claire	c59fb65ddc	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.	2024-01-17 18:32:15 +01:00
Matt Jankowski	1b0cb3b54d	Announcement reactions query spec improvement and refactor (#28768)	2024-01-17 09:18:13 +00:00
Claire	278597c161	Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream	2024-01-15 20:53:16 +01:00
Claire	2f521bc84a	Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream	2024-01-15 20:27:41 +01:00
Claire	464051c2d2	Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream	2024-01-15 20:06:31 +01:00
Claire	98b5f85f10	Rename and refactor User#confirm! to User#mark_email_as_confirmed! (#28735)	2024-01-15 18:04:58 +00:00
Claire	e621c1c44c	Fix registrations not checking MX records for email domain blocks requiring approval (#28608)	2024-01-15 17:10:57 +00:00
Matt Jankowski	a2f02a0775	Disable Rails/SkipsModelValidations cop (#28712)	2024-01-15 13:46:47 +00:00
Claire	8cb4825c8b	Fix sign-up restrictions based on email addresses not being enforced (#28732)	2024-01-15 11:06:48 +00:00
Jeremy Kescher	c677b8de19	v4.3.0-alpha.0+glitch+cat+1.0.5	2024-01-12 22:03:50 +01:00
Matt Jankowski	a90c134850	Move followable by logic to suggestion class (#28710)	2024-01-12 13:09:33 +00:00
Claire	23d8bd8ce1	Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream	2024-01-11 13:24:20 +01:00
Claire	630b245bb4	Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused.	2024-01-11 12:59:27 +01:00
Claire	47d213e701	Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream	2024-01-10 18:41:04 +01:00
Claire	0b2c7cdb02	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.	2024-01-10 17:51:12 +01:00
Matt Jankowski	543d7890fd	Use normalizes to prepare User values (#28650) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-10 13:36:06 +00:00
Claire	10203bd57a	Clean up Setting model and remove dead code (#28661)	2024-01-09 14:01:53 +00:00
Jean Boussier	1781849884	Inline what remains of the rails-settings-cached gem (#28618) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-09 11:50:21 +00:00
Matt Jankowski	cd4b4d4734	Replace unused by_recent_sign_in scope (#28616)	2024-01-08 15:31:13 +00:00
Matt Jankowski	e677eb164c	Remove unused Announcement#time_range? (#28648)	2024-01-08 15:26:30 +00:00
Matt Jankowski	3e43cd095c	Remove unused scope Announcement.without_muted (#28645)	2024-01-08 15:26:14 +00:00
Matt Jankowski	9322396e58	Use normalizes to prepare Account#username value (#28646)	2024-01-08 13:48:31 +00:00
Matt Jankowski	cd58e37b25	Remove unused DomainBlock#affected_accounts_count method (#28642)	2024-01-08 13:38:52 +00:00
Matt Jankowski	4ccba94489	Remove unused *_silenced_accounts scopes on Status (#28644)	2024-01-08 13:35:53 +00:00
Matt Jankowski	c52a593a30	Remove unused scope User.emailable (#28647)	2024-01-08 13:33:45 +00:00
Matt Jankowski	e827c4692c	Use Arel matches method in CustomEmoji search (#28615)	2024-01-08 13:26:12 +00:00
Matt Jankowski	1bc5a52139	Extract SQL heredoc method for Announcement scopes (#28613)	2024-01-08 11:22:16 +00:00
Matt Jankowski	aa6d07dbd9	Use normalizes to prepare CustomEmoji domain value (#28624)	2024-01-08 11:20:59 +00:00
Matt Jankowski	202951e6d9	Use Arel in_order_of method to generate CASE for DomainBlock.by_severity (#28617)	2024-01-08 11:15:36 +00:00
Matt Jankowski	57f49c8191	Use Arel nulls_first method in ordering CustomEmojiFilter scope (#28614)	2024-01-08 11:09:50 +00:00
Jean Boussier	5a6d533c53	Enable Rails 7.1 Marshalling format (#28609)	2024-01-05 21:57:47 +00:00
Matt Jankowski	12bed81187	Add validation specs to CustomFilter model (#28600)	2024-01-05 15:13:59 +00:00
Jeremy Kescher	abb21a1eab	Merge branch 'glitch-soc' into develop	2024-01-04 17:30:03 +01:00
Claire	dfdadb92e8	Add ability to require approval when users sign up using specific email domains (#28468)	2024-01-04 09:07:05 +00:00
Michael Stanclift	195b89d336	Fix .opus file uploads being misidentified by Paperclip (#28580)	2024-01-03 19:02:53 +00:00
Jeremy Kescher	5be3fb3d66	Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions	2024-01-02 12:16:35 +01:00
Essem	01b6cbe577	Linting fixes	2023-12-29 12:39:01 -06:00
Essem	421e3ea8ba	Fix reblog reactions	2023-12-29 12:33:13 -06:00
Essem	08a21c1af6	Add notification emails for reactions	2023-12-29 12:33:13 -06:00
Essem	6ae86f40d1	Add support for emoji reactions ... Squashed, modified, and rebased from glitch-soc/mastodon#2221. Co-authored-by: fef <owo@fef.moe> Co-authored-by: Jeremy Kescher <jeremy@kescher.at> Co-authored-by: neatchee <neatchee@gmail.com> Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com> Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>	2023-12-29 12:33:13 -06:00
Claire	35b6583371	Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream	2023-12-29 17:40:57 +01:00
Claire	fcfdeadc04	Fix random NoMethodError errors on cached CustomFilter objects (#28521)	2023-12-29 16:23:07 +00:00
Matt Jankowski	ba5f659bb3	Use shorter attribute query methods in Announcement (#28474)	2023-12-29 10:55:50 +00:00
Matt Jankowski	128c5b7db3	Fix Performance/StringIdentifierArgument cop (#28508)	2023-12-29 10:23:30 +00:00
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
Claire	ea6c187fca	Fix media attachment order of remote posts (#28469)	2023-12-22 18:45:36 +01:00
Claire	2bf84b93d4	Fix media attachment order of remote posts (#28469)	2023-12-22 15:10:39 +00:00
Claire	30ee7339d3	Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied.	2023-12-21 19:31:12 +01:00
Claire	f5b7307890	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines.	2023-12-21 19:24:10 +01:00
Claire	a60b9acf3c	Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream	2023-12-21 19:04:20 +01:00
Claire	6e56f95285	Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.	2023-12-21 18:17:17 +01:00
Claire	077e0c6812	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.	2023-12-20 22:16:50 +01:00
Claire	75580360cd	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream fixed a bunch lint issues, and changed the `Max` parameter of the `Metrics/AbcSize` cop. Glitch-soc has different code and slightly higher `AbcSize` complexity, modified the `.rubocop_todo.yml` file accordingly. - `app/policies/status_policy.rb`: Upstream changed `account.suspended?` to `account.unavailable?` to prepare for delete flags. Glitch-soc has additional local-only conditions. Ported upstream's refactor while keeping glitch-soc's additional condition. - `app/serializers/initial_state_serializer.rb`: Upstream refactored a bunch of stuff while glitch-soc has more settings. Refactored as upstream did while keeping glitch-soc's settings.	2023-12-20 22:05:31 +01:00
Claire	b8209c3b96	Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now.	2023-12-20 20:10:45 +01:00
Claire	d29b1cca2e	Fix friends_of_friends sometimes suggesting already-followed accounts (#28433)	2023-12-20 14:35:59 +00:00
Claire	b135b6ba8f	Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.	2023-12-19 21:24:01 +01:00
Claire	2e786e13cb	Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_pin_validator.rb`: Upstream refactored that file, while glitch-soc had configurable limits for pinned statuses. Updated the code with upstream's refactor, while keeping glitch-soc's configurability.	2023-12-19 20:51:37 +01:00
Claire	8afd313807	Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming. - `yarn.lock`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming.	2023-12-19 20:06:32 +01:00
Eugen Rochko	b5ac61b2c5	Change algorithm of follow recommendations (#28314) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-12-19 10:59:43 +00:00
Claire	a111fd7a0b	Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream	2023-12-18 20:47:27 +01:00
Claire	d6ad9d351e	Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream	2023-12-18 19:10:43 +01:00
Claire	7d9b209fe8	Fix call to inefficient delete_matched cache method in domain blocks (#28374)	2023-12-18 16:14:43 +00:00
Matt Jankowski	1820bad646	Fix Performance/StringIdentifierArgument cop (#28399)	2023-12-18 10:26:09 +00:00
Matt Jankowski	0e5b8fc46b	Fix Style/RedundantReturn cop (#28391)	2023-12-18 09:50:51 +00:00
Claire	4113fbf6e8	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules.	2023-12-17 23:04:16 +01:00
Claire	1474318691	Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main ... Conflicts: - `app/models/trends/statuses.rb`: Upstream fixed a bug in the trending post condition. Glitch-soc's condition is different because we potentially allow CWed content to trend. Ported upstream's fix while keeping glitch-soc's change. - `config/initializers/content_security_policy.rb`: Kept our version for now, we will switch to upstream later down the road.	2023-12-17 15:32:29 +01:00
Matt Jankowski	b1dec09d20	Fix Style/InverseMethods cop (#28377)	2023-12-15 15:52:00 +00:00
Claire	dcc24db793	Fix N+1s because of association preloaders not actually getting called (#28339)	2023-12-13 07:47:32 +00:00
Claire	9f92b05bd2	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md`	2023-12-10 18:05:02 +01:00
Matt Jankowski	3918dc68c7	Use composite primary key for PreviewCardsStatus model (#28208)	2023-12-07 14:49:05 +00:00
Matt Jankowski	5631f139c1	Fix Lint/SymbolConversion cop (#28175)	2023-12-01 15:53:35 +00:00
Matt Jankowski	d83d01eb1e	Fix Lint/RedundantSafeNavigation cop (#28172)	2023-12-01 15:52:56 +00:00
Matt Jankowski	f70f39dd04	Add explicit dependent: nil to associations (#28169)	2023-12-01 15:52:47 +00:00
Matt Jankowski	440b80b2e7	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
Claire	963354978a	Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053)	2023-11-30 15:43:26 +00:00
Matt Jankowski	bb0efe16e6	Remove default_scope from MediaAttachment class (#28043)	2023-11-30 13:30:35 +00:00
Matt Jankowski	e48ecd2929	Remove default_scope from Admin::ActionLog (#28026)	2023-11-29 10:39:59 +00:00
Matt Jankowski	186895fc88	Refactor, lint fix, and bug fix on admin/roles/form partial (#27558)	2023-11-29 10:00:52 +00:00
Claire	3a24754229	Change GIF max matrix size error to explicitly mention GIF files (#27927)	2023-11-24 09:31:28 +00:00
Matt Jankowski	4be12791e6	Remove default_scope from StatusEdit class (#28042)	2023-11-23 09:26:11 +00:00
Eugen Rochko	cdc57c74b7	Fix unsupported time zone or locale preventing sign-up (#28035) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-22 11:38:07 +00:00
Matt Jankowski	d2aacea8da	Reduce .times usage in AccountSearch spec, use constant for default limit (#27946)	2023-11-20 09:08:22 +00:00
ppnplus	2b038b4f89	Added Thai diacritics and tone marks in HASHTAG_INVALID_CHARS_RE (#26576)	2023-11-14 15:33:59 +00:00
Matt Jankowski	b7807f3d84	Use normalizes to prepare Webhook#events value (#27605)	2023-11-13 22:47:44 +00:00
Eugen Rochko	0d14fcebae	Change link previews to keep original URL from the status (#27312)	2023-11-13 09:58:28 +00:00
Matt Jankowski	45770c9306	Fix Performance/MapMethodChain cop (#27744)	2023-11-07 13:01:09 +00:00
Matt Jankowski	bbad5b6456	Remove false positive cop detection (#27457)	2023-11-07 10:44:15 +00:00
Claire	6c52f8286b	Fix posts from force-sensitized accounts being able to trend (#27620)	2023-10-30 22:32:25 +00:00
Claire	93e4cdc31b	Fix hashtag matching pattern matching some URLs (#27584)	2023-10-27 14:04:51 +00:00
Matt Jankowski	12550a6a28	Use Rails.env.local? shorthand method to check env (#27519)	2023-10-26 21:20:41 +00:00
Claire	4ef66d6538	Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: glitch-soc had extra ignores. Removed them.	2023-10-24 20:31:20 +02:00
Claire	4b0fb764c3	Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream ... Conflicts and ported changes: - updated `@rails/ujs` imports	2023-10-24 19:59:19 +02:00
Claire	57c0de949b	Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream changed how asset host CSP directives are used, and glitch-soc has a pretty different CSP file. It may be worth reconsidering the differences between upstream and glitch-soc but for now, just port the change.	2023-10-24 19:17:20 +02:00
Claire	787d5ad386	Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Caused by a glitch-soc-only dependency (`exif-js`). Kept it.	2023-10-24 19:05:18 +02:00
Claire	b0c76eaadd	Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream changed one import, close to a glitch-soc-only import to handle different max character counts. Ported upstream's change.	2023-10-24 18:41:20 +02:00
Matt Jankowski	714e3ae5b5	Use Rails 7.1 normalizes feature (#27521)	2023-10-24 10:06:10 +00:00
Matt Jankowski	e93a75f1a1	Rails 7.1 update (#25963)	2023-10-23 17:58:29 +00:00
Claire	8b770ce811	Add warnings to report action logs (#27425)	2023-10-23 14:30:46 +02:00
Claire	bcae744275	Fix some link anchors being recognized as hashtags (#27271)	2023-10-23 14:19:38 +02:00
Matt Jankowski	b0213472df	Validate allowed schemes on preview card URLs (#27485)	2023-10-23 09:50:02 +02:00
Claire	74fd46d3ab	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	2023-10-19 19:14:04 +02:00
Matt Jankowski	63a2a4b074	Fix Performance/DeletePrefix cop (#27448)	2023-10-18 10:32:09 +02:00
Claire	c10a667ac2	Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream	2023-10-17 21:42:49 +02:00
Matt Jankowski	08a376cbcb	Fix Style/CombinableLoops cop (#27429)	2023-10-16 16:36:28 +02:00
Claire	53f5b27bd1	Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream	2023-10-08 17:30:48 +02:00
Claire	ac2370778a	Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream ... Conflicts: - `config/environments/production.rb`: Upstream enforced a code style change and glitch-soc had a few different lines. Applied upstream's code style to glitch-soc's changes.	2023-10-08 17:21:12 +02:00
Claire	d7fcd70023	Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/cors.rb`: Upstream refactored this file, and glitch-soc had local changes. I could not find the rationale for the glitch-soc changes, so I used upstream's version.	2023-10-08 16:41:56 +02:00
Claire	19ebf7797e	Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream	2023-10-08 16:30:00 +02:00
Claire	340c390849	Fix crash when filtering for “dormant” relationships (#27306)	2023-10-06 12:58:16 +02:00
Matt Jankowski	c676bc91e9	Dont match mention in url query string (#25656) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-10-03 17:01:45 +02:00
Matt Jankowski	2016c5d912	Fix deprecation warning about rewhere: true being default behavior (Rails 7.1 prep) (#27190)	2023-09-28 16:52:23 +02:00
Matt Jankowski	3060bfa4bd	Extract filename and csv helper methods from Form::Import (#26129)	2023-09-28 16:22:05 +02:00
Claire	686406cc2d	Fix filtering audit log for entries about disabling 2FA (#27186)	2023-09-28 13:41:24 +02:00
Claire	abdb58840a	Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +02:00
Essem	bd810391d6	Properly remove tIME chunk from PNG uploads (#27111)	2023-09-25 19:21:07 +02:00
Claire	1bd7455d81	Fix inefficient queries in “Follows and followers” as well as several admin pages (#27116)	2023-09-25 15:06:43 +02:00
Claire	39da3d86f8	Fix ActiveRecord using two connection pools when no replica is defined (#27061)	2023-09-22 16:01:59 +02:00
Claire	dfc05ec8df	Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream modified this file close to a line modified by glitch-soc to disable the ARMv64 builder (as glitch-soc doesn't have one). Ported upstream's changes. - `.github/workflows/build-releases.yml`: Upstream modified this file close to lines changed by glitch-soc to change the Docker image repositories used (only ghcr, and based on the organization's name). Ported upstream's changes.	2023-09-15 21:43:49 +02:00
Claire	5ed72f668f	Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream	2023-09-15 21:39:21 +02:00
Claire	08b495d95c	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +02:00