3333 commits

Author	SHA1	Message	Date
Matt Jankowski	0a2110b9af	Add coverage for custom filters (#30347)	2024-05-20 15:00:09 +00:00
Claire	e46321e63d	Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
Claire	de4815afda	Add more tests for self-destruct mode (#30374)	2024-05-20 10:06:51 +00:00
Matt Jankowski	def6b686ff	Fix Rails/WhereRange cop (#30343)	2024-05-20 09:37:36 +00:00
Matt Jankowski	70608f824e	Add coverage for AdminMailer#auto_close_registrations (#30349)	2024-05-20 08:03:39 +00:00
Emelia Smith	2da2a1dae9	Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192)	2024-05-17 13:46:12 +00:00
Jeremy Kescher	70c76a1f30	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-17 15:33:30 +02: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
Matt Jankowski	65e82211cd	Rename cache_* methods to preload_* in controller concern (#30209)	2024-05-16 08:03:46 +00:00
Emelia Smith	5fd56512de	Improve Report Notes and Account Moderation Notes (#30288)	2024-05-15 13:38:36 +00:00
Jason Punyon	85c625d319	Fix repetitive database queries from #30040 (#30259)	2024-05-15 09:38:16 +00:00
Matt Jankowski	6beead3867	Move simplecov config into rails_helper (#30302)	2024-05-15 09:33:36 +00:00
Renaud Chaput	40639510f8	Retain unconfirmed users longer (1 week) (#30285)	2024-05-15 08:27:34 +00:00
Jeremy Kescher	74ed5bf354	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-14 18:56:01 +02:00
Jeremy Kescher	e73c612cb1	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-11 23:31:31 +02:00
Claire	f35ba6963d	Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream	2024-05-11 22:10:56 +02:00
Matt Jankowski	0d397db5dd	Consolidate system specs into single directory, use rspec tags for configuration (#30206)	2024-05-10 12:36:09 +00:00
Matt Jankowski	fa43a6c835	Use more accurate redirect_uri in oauth spec (#30212)	2024-05-10 09:43:59 +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
Emelia Smith	116f01ec7d	Implement RFC 8414 for OAuth 2.0 server metadata (#29191)	2024-05-06 13:17:56 +00:00
Claire	30ef9fccf0	Fix hashtag matching pattern matching some link anchors (#30190)	2024-05-06 12:47:19 +00:00
Matt Jankowski	dbaa4ed891	Use chewy which relaxes ES version reqs (#30157)	2024-05-06 11:50:45 +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	d6f9c97ae4	Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream	2024-05-04 15:24:22 +02:00
Claire	253ead3aa7	Fix not being able to block a subdomain of an already-blocked domain through the API (#30119)	2024-05-02 20:56:21 +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
Matt Jankowski	2447497a4c	Status length validation spec updates (#30132)	2024-05-02 08:31:06 +00:00
Claire	b039e62194	Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream	2024-05-01 19:49:59 +02:00
Claire	eeefb7cdbc	Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream	2024-05-01 19:42:34 +02: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	555e33a392	Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Conflict because of our different theming systems. Updated accordingly, along with `app/helpers/theme_helper.rb` and `app/helpers/theme_helper_spec.rb`.	2024-05-01 18:38:55 +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	2c386d4cfe	Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream	2024-05-01 17:06:49 +02:00
Claire	d52263e0e3	Merge commit '143d9553fa0187b9950a802cdedaea5c8cd12f75' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependencies as well.	2024-05-01 17:04:33 +02:00
Claire	7b46517c38	Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream	2024-05-01 14:31:14 +02:00
Claire	7208edbd37	Replace use_pack, layouts/theme and @theme by new helpers ... Packs are now loaded from views, just like upstream, and are identified by their filenames. The definition of `theme.yml` has changed as such: - `pack_directory` is now required - `pack` is now unused - `signed_in_preload` has been introduced	2024-04-28 15:45:42 +02:00
Claire	91ca90e25b	Fix Idempotency-Key ignored when scheduling a post (#30084)	2024-04-26 13:19:02 +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
Emelia Smith	049b159beb	Add read:me OAuth 2.0 scope, allowing more limited access to user data (#29087)	2024-04-23 11:47:00 +00:00
Matt Jankowski	a15139bc02	Fix intermittent order based failure in UpdateStatusService spec (#30008)	2024-04-22 08:30:38 +00:00
Matt Jankowski	f5d341382e	Add any_args to have_enqueued_sidekiq_job call (quiets deprecation) (#29999)	2024-04-19 19:44:59 +00:00
Matt Jankowski	11e0049b08	Use enum-generated scopes/queries for BulkImport (#29975)	2024-04-18 10:13:35 +00:00
Claire	8bece467f8	Change have_enqueued_sidekiq_job usage to always make argument expectations explicit (#29974)	2024-04-17 11:13:52 +00:00
Matt Jankowski	650c548c31	Add not_featured_by scope to Tag (#28815)	2024-04-17 10:05:38 +00:00
Matt Jankowski	9ce2db4136	Combine double subject runs and DRY up change check in bulk import service spec (#29402)	2024-04-17 08:23:25 +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	7fed4a9740	Pull out repeated setup to shared setup in statusus/show view spec (#29927)	2024-04-15 15:24:31 +00:00
Matt Jankowski	61d108f415	Extract header_tags method in statuses/show view spec (#29907)	2024-04-12 09:50:46 +00:00
Matt Jankowski	da6b9238f5	Expand coverage for admin/metrics/measure/* classes (#29914)	2024-04-12 09:38:24 +00:00
Matt Jankowski	ec5a0e0f5e	Expand coverage for admin/metrics/dimension/* classes (#29913)	2024-04-12 09:18:35 +00:00
Matt Jankowski	449f99e168	Fix repeated concat output buffer duplicating layout markup (#29918)	2024-04-11 23:37:07 +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	576554b19b	Use fabrication sequence in domain values (#29895)	2024-04-11 08:59:01 +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
Claire	e73cf356d2	Move OAuth flow tests from feature tests to system tests (#29837)	2024-04-05 16:52:05 +00:00
Matt Jankowski	b61ae28f8d	Separate methods for theme style and meta color tags (#29802)	2024-04-05 09:52:43 +00:00
Matt Jankowski	59da591d13	Improve spec for dimension/languages admin metric (#29842)	2024-04-05 08:54:11 +00:00
Claire	38b9d31f63	Improve email address validation (#29838)	2024-04-05 07:48:45 +00:00
Claire	1f11aa5f04	Add stub for trending tags in user mailer spec (#29850)	2024-04-05 07:48:07 +00:00
Matt Jankowski	191bf5876e	Add coverage for sanitize failure path in api/web/embeds spec (#29851)	2024-04-04 16:07:16 +00:00
Matt Jankowski	f87959ab50	Fix RSpec/LetSetup cop in api/v1/timelines/public spec (#28972)	2024-04-02 14:05:02 +00:00
Matt Jankowski	34489591ec	Add max_pinned_statuses to instances serializer and api response (#29441)	2024-04-02 13:54:11 +00:00
Renaud Chaput	b4d991adaa	Use integers and not numbers in notification policy API counters (#29810)	2024-04-02 10:06:26 +00:00
renovate[bot]	589e34d00c	Update dependency selenium-webdriver to v4.19.0 (#29776) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-04-02 08:53:44 +00:00
Claire	9c24f2d6b1	Undo notification permissions on individual and domain blocks (#29570)	2024-03-26 14:46:38 +00:00
Claire	81a04ac25c	Improve specs for severed relationships (#29688)	2024-03-22 16:25:36 +00:00
Matt Jankowski	34f293475e	Fix results/query in api/v1/featured_tags/suggestions (#29597)	2024-03-22 15:08:27 +00:00
Claire	05eda8d193	Remove severed relationship notifications for single account suspensions (#29700)	2024-03-21 21:53:24 +00:00
Claire	814a48517f	Add some more tests for notification policies (#29698)	2024-03-21 16:46:38 +00:00
Claire	7434c9c276	Fix the relationships controller spec, since it requires an extra model now (#29671)	2024-03-21 08:28:37 +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	c0aade79b0	Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream	2024-03-20 18:31:09 +01: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	6d2986017e	Remove unused active_nav_class helper method (#29617)	2024-03-18 13:24:59 +00:00
Claire	d5063072c3	Revert friends-of-friends follow recommendation query to using a CTE (#29619)	2024-03-18 12:57:21 +00:00
Matt Jankowski	92855948a0	Remove unused show_landing_strip? helper method (#29618)	2024-03-18 08:55:54 +00:00
Matt Jankowski	ecdbf15ebe	Remove unused link_to_older and link_to_newer helper methods (#29620)	2024-03-18 08:54:46 +00:00
Claire	b8f476256e	Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream	2024-03-15 22:48:04 +01:00
Matt Jankowski	4f4132f1a1	Add diagnostic message for failure during CLI search deploy (#29462)	2024-03-15 14:26:23 +00:00
Claire	2e49bc97b0	Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream	2024-03-15 12:20:32 +01:00
Matt Jankowski	2e91a9bd34	Add include_pagination_headers matcher to check Link header in api specs (#29596)	2024-03-15 10:17:45 +00:00
Matt Jankowski	e75b55a6d7	Extract target account on list method in bulk import row service spec (#29601)	2024-03-15 09:31:25 +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	974c7672e5	Extract shared behavior methods in oauth feature spec (#28360)	2024-03-14 13:42:59 +00:00
Matt Jankowski	0bc17a3d48	Use enum-generated public_visibility scope on Status (#28156)	2024-03-14 09:31:57 +00:00
Matt Jankowski	681a89f684	Readability clean up in ImportVacuum spec (#28955)	2024-03-14 09:24:00 +00:00
Matt Jankowski	f9100743ec	Add Api::ErrorHandling concern for api/base controller (#29574)	2024-03-14 09:09:47 +00:00
Matt Jankowski	42875fee52	Add coverage for bad args/options in CLI::Domains#purge (#29578)	2024-03-14 08:58:53 +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	27ffc09847	Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream	2024-03-13 18:56:40 +01:00
Matt Jankowski	71e5f0f48c	Add coverage for suspended instance actor scenario (#29571)	2024-03-13 15:43:40 +00:00
Matt Jankowski	6262ceeb70	Fix RSpec/DescribedClass cop (#29472)	2024-03-13 15:42:39 +00: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
Matt Jankowski	46e902f1f3	Merge api/v1/accounts/credentials controller spec into existing request spec (#29006)	2024-03-13 09:22:43 +00:00
Matt Jankowski	01b624c4a0	Use normalizes on CustomFilter#context value (#27602)	2024-03-13 08:50:21 +00:00
Matt Jankowski	71eecbfa1f	Move api/v2/filters/* to request spec (#28956)	2024-03-13 08:47:09 +00:00
Matt Jankowski	8349b45d60	Accept extra args that we wont verify in ap/activity/add_spec (#29005)	2024-03-13 08:46:11 +00:00
Matt Jankowski	469028b6d3	Remove unneeded type: :service from spec/services files (#29304)	2024-03-13 08:39:26 +00:00
Matt Jankowski	3eaac3af73	Use before_all block to setup requests/cache_spec data (#29437)	2024-03-13 08:38:57 +00:00
Matt Jankowski	19f0590795	Add basic coverage for TagSearchService class (#29319)	2024-03-13 08:33:03 +00:00
Matt Jankowski	96013cd576	Reduce RSpec/ExampleLength in CSP request spec (#29104)	2024-03-13 08:22:32 +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
Matt Jankowski	24319836de	Convert request-based setup into factory setup in push/subscriptions request spec (#29489)	2024-03-11 15:46:25 +00:00
Matt Jankowski	a38e424185	Use unchanging github links in docs/comments (#29545)	2024-03-11 15:14:55 +00: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
Matt Jankowski	a7284690fc	Add coverage for admin/metrics base classes, simplify subclass generation (#29527)	2024-03-11 09:16:19 +00:00
Matt Jankowski	98ef38e34e	Ensure unique values in fabricators (#29515)	2024-03-11 08:53:24 +00: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
Matt Jankowski	18945f62e0	Convert more API specs from controller->request style (#29004)	2024-03-01 16:24:45 +00:00
Daniel M Brasil	a25014de8f	Improve IpBlock model test coverage (#29460)	2024-03-01 16:17:40 +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
Claire	4d7e7cc562	Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream	2024-02-29 18:24:47 +01:00
Matt Jankowski	eb1b8f69de	Allow pagination Link headers on API accounts/statuses when pinned true (#29442)	2024-02-29 14:21:56 +00:00
Matt Jankowski	6675bf574a	Extract parsed_uri_query_values helper in ap/replies controller spec (#29410)	2024-02-29 13:47:38 +00:00
Matt Jankowski	14c65180df	Use sequence in software_update fabricator to allow multiple (#29438)	2024-02-29 10:51:11 +00:00
Jeremy Kescher	de1e89f42c	Merge branch 'glitch-soc' into develop	2024-02-28 23:01:31 +01:00
Claire	ccdf56085d	Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream	2024-02-28 20:37:38 +01:00
Claire	a482932649	Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.	2024-02-27 19:20:57 +01:00
Matt Jankowski	8f3c91fc3c	Add change block expectation to admin/invites#deactivate_all spec (#29412)	2024-02-27 16:25:58 +00:00
Claire	6f7615ba86	Add basic end-to-end test for admin moderation interface (#29424)	2024-02-27 15:18:06 +00:00
Matt Jankowski	9e78129e6e	Use "cacheable response" shared example in more places (#29419)	2024-02-27 11:50:21 +00: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	8156113d58	Use response_vary_headers method in requests/cache_spec (#29411)	2024-02-26 16:27:07 +00:00
Damien Mathieu	1540f42522	Better tests for auth/registrations#update (#29303)	2024-02-26 16:09:56 +00:00
Wolfgang Fournès	d51c3ac087	Add a missing spec to SessionsController#webauthn_options (#29277)	2024-02-26 16:09:40 +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
Jeremy Kescher	8f8cb0fad3	Merge branch 'glitch-soc' into develop	2024-02-24 17:51:18 +01:00
Claire	2dc244784c	Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream	2024-02-24 15:43:15 +01:00
Claire	1ad91dece8	Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Changes applied to `app/javascript/core/admin.js` instead.	2024-02-24 15:35:56 +01:00
Claire	7901dc9e24	Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream ... Conflicts: - `app/workers/scheduler/auto_close_registrations_scheduler.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version.	2024-02-24 15:33:36 +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
Claire	dfd74f0dae	Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream	2024-02-24 14:15:49 +01:00
Claire	73de36318e	Move api/v1/timelines/direct to request spec	2024-02-24 14:10:05 +01:00
Claire	9903e6beab	Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream ... Conflicts: - `spec/controllers/api/v1/timelines/direct_controller_spec.rb`: `spec/controllers/api/v1/timelines` has been renamed, but we had an extra spec here for a glitch-soc-only endpoint. Kept glitch-soc's file unchanged (will port to a request spec later).	2024-02-24 14:05:26 +01:00
Claire	c297d999ba	Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream	2024-02-24 14:02:01 +01:00
Claire	20615a516d	Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream	2024-02-24 13:53:59 +01:00
Jeremy Kescher	a4e12a484d	Merge branch 'glitch-soc' into develop	2024-02-24 11:11:24 +01:00
Matt Jankowski	b0064ddda7	Add basic coverage for MoveService class (#29301)	2024-02-23 09:59:29 +00:00
Claire	9d8dfeb5fb	Fix processing of Link objects in Image objects (#29335)	2024-02-22 22:27:24 +01:00
Matt Jankowski	a6ed148769	Use heredoc on the HTML blocks in verify link spec (#29365)	2024-02-22 21:26:48 +00:00
Claire	10a0d76bf0	Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream completely redesigned this, and glitch-soc had different handling for the character limit. Ported upstream's change to the new version. - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream completely redesigned this, and glitch-soc had different limits for option length and number of options. Ported glitch-soc's changes to the new version. Additional change: - `app/javascript/styles/components.scss`: Change how the new image is looked up.	2024-02-22 20:58:41 +01:00
Claire	f25414014a	Fix link verifications when page size exceeds 1MB (#29358)	2024-02-22 20:45:40 +01:00
Claire	d23f445527	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
Claire	5152dd869e	Fix link verifications when page size exceeds 1MB (#29358)	2024-02-22 17:31:50 +00:00
Claire	b71904816a	Change registrations to be disabled by default for new servers (#29280)	2024-02-22 13:28:19 +00:00
Matt Jankowski	e9b0f0c314	Add basic coverage for RemoveDomainsFromFollowersService class (#29327)	2024-02-22 10:53:38 +00:00
Matt Jankowski	7c7dfe7de3	Add basic coverage for RemoveFeaturedTagService class (#29328)	2024-02-22 10:51:04 +00:00
Matt Jankowski	6342ddd698	Add basic coverage for UnfavouriteService class (#29329)	2024-02-22 10:48:42 +00:00
Matt Jankowski	f70905f127	Add basic coverage for UnmuteService class (#29330)	2024-02-22 10:48:09 +00:00
Matt Jankowski	a69fe534e3	Add basic coverage for WebhookService class (#29331)	2024-02-22 10:46:20 +00:00
Matt Jankowski	d1602c017d	Add basic coverage for ApproveAppealService class (#29333)	2024-02-22 10:40:07 +00:00
Matt Jankowski	ab2ef63a03	Add basic coverage for VoteService class (#29334)	2024-02-22 10:39:18 +00:00
Claire	2751acb6cd	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-21 17:45:06 +00:00
Matt Jankowski	08342ad40c	Add basic coverage for AfterUnallowDomainService class (#29324)	2024-02-21 17:13:11 +00:00
Matt Jankowski	8f61e32569	Add basic coverage for AppealService class (#29322)	2024-02-21 17:12:31 +00:00
Matt Jankowski	b73932461f	Add basic coverage for CreateFeaturedTagService class (#29321)	2024-02-21 16:58:19 +00:00
Matt Jankowski	5f19e7e799	Add basic coverage for ProcessHashtagsService class (#29320)	2024-02-21 16:57:45 +00:00
Matt Jankowski	1f648fdf1a	Remove erroneous service type on TagFeed model spec (#29302)	2024-02-21 11:25:33 +00:00
Matt Jankowski	64f9939e39	Use capture_emails helper to improve email assertions in specs (#29245)	2024-02-19 15:57:47 +00:00
Wolfgang Fournès	86627ea2e4	Add a missing thread example to the statuses spec (#29278)	2024-02-19 13:35:58 +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
Claire	96ddf1d482	Fix flaky end-to-end OCR test (#29244)	2024-02-16 16:57:23 +00:00
Jeremy Kescher	ce878a78bb	Merge branch 'glitch-soc' into develop	2024-02-16 14:48:08 +01:00
Matt Jankowski	1946e171e6	Reduce round trips in admin/disputes/appeals spec (#29234)	2024-02-16 13:46:28 +00:00
Matt Jankowski	3454fcbd71	Reduce round trips in auth/sessions spec (#29233)	2024-02-16 13:38:49 +00:00
Matt Jankowski	a316c0e38d	Reduce round trips in disputes/appeals spec (#29232)	2024-02-16 13:01:15 +00:00
Matt Jankowski	117b507df5	Extract subject from User#mark_email_as_confirmed! spec (#29231)	2024-02-16 13:01:04 +00:00
Matt Jankowski	1690fb39e6	Reduce RSpec/MultipleExpectations in instance_actors_controller spec (#29229)	2024-02-16 13:00:11 +00:00
Matt Jankowski	bba488c189	Reduce RSpec/MultipleExpectations in media_attachment spec (#29228)	2024-02-16 13:00:09 +00:00
Claire	6c1b6194f7	Merge pull request from GHSA-jhrq-qvrm-qr36 ... * Fix insufficient Content-Type checking of fetched ActivityStreams objects * Allow JSON-LD documents with multiple profiles	2024-02-16 12:17:15 +01:00
Claire	9fee5e8526	Merge pull request from GHSA-jhrq-qvrm-qr36 ... * Fix insufficient Content-Type checking of fetched ActivityStreams objects * Allow JSON-LD documents with multiple profiles	2024-02-16 11:56:12 +01:00
Matt Jankowski	a9f9b0097b	Reduce RSpec/MultipleExpectations in captcha feature spec (#29226)	2024-02-16 07:52:57 +00:00
Matt Jankowski	4b7f04e3ea	Reduce RSpec/MultipleExpectations in post_status_service spec (#29225)	2024-02-16 07:52:29 +00:00
Matt Jankowski	ed4939296a	Reduce RSpec/MultipleExpectations in ap/activity/create spec (#29224)	2024-02-16 07:43:00 +00:00
Matt Jankowski	1df2ffc3ee	Use subject in blacklist email validator spec (#29211)	2024-02-16 07:42:03 +00:00
Matt Jankowski	fc4f823464	Avoid local block var assignment in ap/process_status_update_service spec (#29210)	2024-02-16 07:41:25 +00:00
Claire	e7ca82762d	Fix user creation failure handling in OAuth paths (#29207)	2024-02-14 23:12:59 +01:00
Claire	d4d0565b0f	Fix user creation failure handling in OAuth paths (#29207)	2024-02-14 21:49:45 +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	486e4bc7d3	Fix OmniAuth tests (#29201)	2024-02-14 16:07:28 +01:00
Claire	bbbbf00084	Fix OmniAuth tests (#29201)	2024-02-14 14:57:49 +00: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	eae436c5a8	Disable administrative doorkeeper routes (#29187)	2024-02-13 20:03:00 +01:00
Emelia Smith	46142cdbdd	Disable administrative doorkeeper routes (#29187)	2024-02-13 18:11:47 +00:00
Claire	ca8fbda5d0	Add end-to-end test for OCR in media uploads (#29148)	2024-02-08 19:13:44 +00:00
Matt Jankowski	a9e91eb955	Add common stub setup for resolv dns in email mx validator spec (#29140)	2024-02-08 14:26:45 +00:00
Matt Jankowski	15437e4ad9	Add context and before to lengthy tag manager spec examples (#29129)	2024-02-08 10:03:04 +00:00
Matt Jankowski	5271131658	Extract helper method for repeated form fill in admin/domain_blocks feature spec (#29128)	2024-02-08 10:02:53 +00:00
Claire	eff447a455	Rewrite signature verification using regexps and StringScanner (#29133)	2024-02-07 17:24:42 +00:00
Matt Jankowski	95da28d201	Add common ThreadingHelper module for specs (#29116)	2024-02-07 14:53:29 +00:00
Claire	7efc33b909	Move HTTP Signature parsing code to its own class (#28932)	2024-02-07 13:35:37 +00:00
Matt Jankowski	da50217b88	Combine repeated requests in admin/accounts controller spec (#29119)	2024-02-07 10:59:32 +00: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
Matt Jankowski	0df86d77fd	Reduce RSpec/ExampleLength in PostStatusService spec example (#29105)	2024-02-06 14:36:04 +00:00
Matt Jankowski	2d6ab44556	Reduce request/response round-trips in ap/collections controller spec (#29102)	2024-02-06 13:10:00 +00:00
Matt Jankowski	978fdc71ca	Reduce expectation count in example from ProcessAccountService spec (#29100)	2024-02-06 13:04:02 +00:00
Matt Jankowski	577520b637	Replace deprecated Sidekiq::Testing block style (#29097)	2024-02-06 12:49:48 +00:00
Matt Jankowski	df7acdcee5	Update markers API spec for error case (#29096)	2024-02-06 12:47:04 +00:00
Emelia Smith	4fb7f611de	Return domain block digests from admin domain blocks API (#29092)	2024-02-06 12:38:14 +00:00
Matt Jankowski	4cf07ed78c	Add missing action logging to api/v1/admin/reports#update (#29044)	2024-02-06 11:34:11 +00:00
Claire	66dda7c762	Fix already-invalid reports failing to resolve (#29027)	2024-02-06 09:35:27 +00:00
Jeremy Kescher	c7e37c256e	Merge branch 'glitch-soc' into develop	2024-02-01 18:18:19 +01:00
Claire	ff58ec0103	Merge pull request from GHSA-3fjr-858r-92rw ... * Fix insufficient origin validation * Bump version to 4.3.0-alpha.1	2024-02-01 15:57:08 +01:00
Claire	1726085db5	Merge pull request from GHSA-3fjr-858r-92rw ... * Fix insufficient origin validation * Bump version to 4.3.0-alpha.1	2024-02-01 15:56:46 +01:00
Matt Jankowski	f4416e6b3a	Configure selenium to use Chrome version 120 (#29038)	2024-02-01 11:15:23 +01:00
Matt Jankowski	8b7b0ee598	Configure selenium to use Chrome version 120 (#29038)	2024-02-01 09:46:31 +00:00
Matt Jankowski	86fbde7b46	Fix Style/NumericLiterals cop in ProfileStories support module (#28971)	2024-01-30 15:38:33 +00:00
Matt Jankowski	f91acba70a	Combine repeated requests in account controller concern spec (#28957)	2024-01-30 15:32:20 +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
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
Matt Jankowski	ff8937aa2c	Move api/v1/statuses/* to request spec (#28954)	2024-01-26 17:45:54 +00:00
Matt Jankowski	44f6d285af	Combine repeated subject in ap fetch remote actor service spec (#28953)	2024-01-26 17:44:12 +00:00
Matt Jankowski	239244e2ed	Combine repeated subject in ap fetch remote account service spec (#28952)	2024-01-26 17:43:08 +00:00
Matt Jankowski	5119fbc9b7	Move api/v1/admin/trends/links/preview_card_providers to request spec (#28951)	2024-01-26 17:41:39 +00:00
Matt Jankowski	b6baab447d	Move api/v2/admin/accounts to request spec (#28950)	2024-01-26 17:41:13 +00:00
Matt Jankowski	7adcc0aae3	Move api/v1/trends/* to request specs (#28949)	2024-01-26 17:40:39 +00:00
Matt Jankowski	0b0ca6f3b8	Move api/v1/timelines/list to request spec (#28948)	2024-01-26 17:40:15 +00:00
Matt Jankowski	e519f113e8	Combine repeated subject in cacheable response shared example (#28945)	2024-01-26 16:37:05 +00:00
Matt Jankowski	d791bca11b	Combine double subject in well_known/webfinger shared example (#28944)	2024-01-26 16:36:21 +00:00
Matt Jankowski	09a3493fca	Combine double subject in api/v1/media shared example (#28943)	2024-01-26 16:35:49 +00:00
Matt Jankowski	5fbdb2055b	Combine repeated subject in cli/accounts spec shared example (#28942)	2024-01-26 16:35:19 +00:00
Matt Jankowski	1a30a517d6	Combine repeated subjects in link details extractor spec (#28941)	2024-01-26 16:31:07 +00:00
Matt Jankowski	685eaa04d4	Combine double subject in admin/statuses controller shared example (#28940)	2024-01-26 16:30:30 +00:00
Matt Jankowski	beb74fd71c	Combine double subjects in instance actors controller shared example (#28939)	2024-01-26 16:28:50 +00:00
Matt Jankowski	beaef4b672	Combine double subjects in application controller shared example (#28938)	2024-01-26 16:23:12 +00:00
Matt Jankowski	6d35a77c92	Combine repeated subjects in models/user spec (#28937)	2024-01-26 16:22:44 +00:00
Matt Jankowski	2f8656334d	Combine double subjects in admin/accounts controller spec (#28936)	2024-01-26 16:21:31 +00:00
Matt Jankowski	9cc1817bb4	Fix intmermittent failure in api/v1/accounts/statuses controller spec (#28931)	2024-01-26 14:10:26 +00:00
Matt Jankowski	0e0a94f483	Handle CLI failure exit status at the top-level script (#28322)	2024-01-26 08:53:44 +00:00
Claire	70de52c297	Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream	2024-01-25 19:51:19 +01:00
Eugen Rochko	6936e5aa69	Change design of compose form in web UI (#28119) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-25 15:41:31 +00: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	2866106ec1	Reduce factory creation in spec/models/account_statuses_cleanup_policy (#28361)	2024-01-25 13:37:25 +00:00
Matt Jankowski	6b6586f5d0	Add CustomFilterKeyword#to_regex method (#28893)	2024-01-25 13:00:34 +00:00
Matt Jankowski	7c9c6c7f80	Fix remaining Rails/WhereExists cop violations, regenerate todo (#28892)	2024-01-25 12:37:07 +00:00
Claire	087415d0fe	Add tests for processing statuses using bearcap URIs (#28904)	2024-01-25 11:13:36 +00:00
Claire	0471a78055	Add tests for redirect confirmations (#28903)	2024-01-25 11:13:33 +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	a11a2fb052	Add error classes to api/base errors coverage (#28864)	2024-01-24 10:31:31 +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
Claire	e2d9635074	Add notification email on invalid second authenticator (#28822)	2024-01-22 13:55:43 +00: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	7ecf7f5403	Move controller->request specs for api/v1/statuses/* (#28818)	2024-01-22 11:58:54 +00:00
Claire	cf2a2ed71c	Fix processing of compacted single-item JSON-LD collections (#28816)	2024-01-19 12:43:10 +00:00
Claire	3593ee2e36	Add rate-limit of TOTP authentication attempts at controller level (#28801)	2024-01-19 12:19:49 +00:00
Matt Jankowski	329911b0a3	Migrate controller->request spec for api/v1/follow* (#28811)	2024-01-19 09:32:41 +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	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	3d82040b26	Reduced repeated setup in UnallowDomainService spec (#28785)	2024-01-18 10:11:10 +00:00
Matt Jankowski	6c5a2d51bc	Reduced repeated setup in PurgeDomainService spec (#28786)	2024-01-18 10:07:49 +00:00
Matt Jankowski	07e10e3747	Combine assertions about same setup in Account#suspend! spec (#28787)	2024-01-18 09:36:59 +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	9a475ea8b3	Finish up the CLI spec area pattern adoption for CLI::Accounts#refresh specs (#28764)	2024-01-17 13:38:37 +00:00
Matt Jankowski	1b0cb3b54d	Announcement reactions query spec improvement and refactor (#28768)	2024-01-17 09:18:13 +00:00
Claire	dee561604b	Merge commit 'b4c332104a8b3748f619de250f77c0acc8e80628' into glitch-soc/merge-upstream	2024-01-15 22:37:21 +01:00
Matt Jankowski	b4c332104a	Use top-level warn in JS errors check (#28745)	2024-01-15 21:26:11 +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	1323dfac80	Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream	2024-01-15 19:19:04 +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
Matt Jankowski	e72676e83a	Improve api/v1/markers#create performance against simultaneous requests (#28718)	2024-01-15 09:47:25 +00:00
Jeremy Kescher	3df2bc2caf	v4.3.0-alpha.0+glitch+cat+1.0.6	2024-01-13 17:46:55 +01:00
Claire	a3b6a85521	Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.	2024-01-13 12:11:29 +01:00
Jeremy Kescher	c677b8de19	v4.3.0-alpha.0+glitch+cat+1.0.5	2024-01-12 22:03:50 +01:00
MitarashiDango	2c05b8a60d	Fix Undo Announce activity is not sent, when not followed by the reblogged post author (#18482) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-12 15:58:28 +00:00
Matt Jankowski	a90696011e	Add coverage/bugfix for invalid appeal submission (#28703)	2024-01-12 09:21:00 +00:00
Matt Jankowski	7801db7ba4	Spec coverage for custom css endpoint (#28706)	2024-01-12 09:19:25 +00:00
Matt Jankowski	df9e220364	Add JS console errors check (#28682)	2024-01-12 09:12:31 +00:00
Matt Jankowski	cd37048439	Move followable_by coverage to suggestions (#28697)	2024-01-12 09:11:34 +00:00
Matt Jankowski	32eeca9c7b	Refresh instance counts in spec (fixes intermittent failure) (#28698)	2024-01-12 09:10:37 +00:00
Claire	15bc13c65b	Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream	2024-01-11 20:15:19 +01:00
Matt Jankowski	8b26614fa7	Combine results include check in spec/models/account (#28471)	2024-01-11 16:17:45 +00:00
Matt Jankowski	185c806d69	Extract spec helper for verifing to/from public AP collection namespace (#28472)	2024-01-11 16:17:21 +00:00
Matt Jankowski	2954279e9c	Remove double subject call in api/v1/admin/trends/links/links spec (#28695)	2024-01-11 15:13:11 +00:00
Matt Jankowski	95bd46d32a	Remove double subject call in api/v1/admin/ip_blocks spec (#28696)	2024-01-11 15:11:57 +00:00
Claire	23d8bd8ce1	Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream	2024-01-11 13:24:20 +01:00
Claire	63acdebc5d	Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because of a code style fix, while some changed lines are absent from glitch-soc. Ignored the deleted lines.	2024-01-11 13:17:13 +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
Matt Jankowski	4e08a4892f	Move streaming around config into manager class (#28684)	2024-01-11 10:54:42 +00:00
Matt Jankowski	87097a227c	Clean up settings/featured_tags/index view (#28688)	2024-01-11 10:45:26 +00:00
Matt Jankowski	55802242ce	Refactor login activity partial (remove inline ruby) (#28687)	2024-01-11 10:36:27 +00:00
Matt Jankowski	0a7cff53c2	Add coverage for Account.followable_by scope (#28689)	2024-01-11 09:30:29 +00: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
Claire	d7e13e2483	Fix potential redirection loop of streaming endpoint (#28665)	2024-01-10 15:05:46 +00:00
Matt Jankowski	8422b8ded0	Extract capybara config and improve headless_chrome driver config (#28681)	2024-01-10 14:54:11 +00: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
Matt Jankowski	00341c70ff	Use Sidekiq fake! instead of inline! in specs (#25369)	2024-01-10 11:06:58 +00:00
Matt Jankowski	742d8d30e2	Add coverage for --days option to CLI media refresh command (#28669)	2024-01-10 09:36:12 +00:00
Renaud Chaput	63d0b52cf3	Add a system spec for the /share endpoint (#28672)	2024-01-09 21:58:19 +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	5dc634796a	Misc coverage improvements re: sidekiq/inline (#28651)	2024-01-09 09:40:08 +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
Claire	157fc69954	Make request_pool_spec tests more robust (#28610)	2024-01-08 12:29:05 +00:00
Matt Jankowski	aa6d07dbd9	Use normalizes to prepare CustomEmoji domain value (#28624)	2024-01-08 11:20:59 +00:00
Matt Jankowski	832b92ac3e	Add attachment check to spec/service/suspend_account_service spec (#28619)	2024-01-08 11:05:10 +00:00
Matt Jankowski	12bed81187	Add validation specs to CustomFilter model (#28600)	2024-01-05 15:13:59 +00:00
Claire	6ad0fb5a77	Fix NULL MX handling and tighten DNS resolving specs (#28607)	2024-01-05 11:07:57 +00:00
Claire	5f4643b895	Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used (#28561)	2024-01-05 10:45:36 +00:00
Jeremy Kescher	3b9a52aab6	Merge branch 'glitch-soc' into develop	2024-01-04 17:57:02 +01:00
Matt Jankowski	964a0ecf37	Add sleep statement to nudge thread scheduler in request pool spec (#28596)	2024-01-04 16:55:00 +00:00
Matt Jankowski	f06c1f1552	Fix Capybara/ClickLinkOrButtonStyle cop in spec/features (#28576)	2024-01-04 09:20:32 +00: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
Claire	0b5783f3f1	Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream	2024-01-03 20:52:19 +01:00
Matt Jankowski	f92d8c654d	Standardize on Thor methods in CLI classes (#28566)	2024-01-03 15:08:08 +00:00
Matt Jankowski	5c769de096	Add spec coverage for CLI::Media#remove_orphans command (#28267)	2024-01-03 14:12:56 +00:00
Matt Jankowski	74a0d81e90	Add coverage for CLI self-destruct command (#28565) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-03 13:06:38 +00:00
Claire	9d9008666b	Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream	2024-01-03 12:38:49 +01:00
Claire	092bb8a27a	Fix Mastodon not correctly processing HTTP Signatures with query strings (#28476)	2024-01-03 11:29:26 +00:00
Claire	bd415af9a1	Change streaming API host to not be overridden to localhost in development mode (#28557)	2024-01-03 10:23:58 +00:00
Claire	b3d871d3a4	Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used ... (backports https://github.com/mastodon/mastodon/pull/28561)	2024-01-02 17:38:32 +01: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	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	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
Claire	19e14654cc	Reduce CSP configuration changes with upstream (#2536)	2023-12-27 09:54:05 +01:00
Claire	a2624ff739	Convert signature verification specs to request specs (#28443)	2023-12-22 18:56:22 +00:00
Claire	ea6c187fca	Fix media attachment order of remote posts (#28469)	2023-12-22 18:45:36 +01:00
Matt Jankowski	bb8077e784	Fix RSpec/LetSetup cop in models/account_status_cleanup_policy (#28470)	2023-12-22 15:29:50 +00:00
Claire	2bf84b93d4	Fix media attachment order of remote posts (#28469)	2023-12-22 15:10:39 +00:00
Matt Jankowski	a4d49c236d	Fix RSpec/LetSetup cop in ap/fetch_featured_collection_service (#28461)	2023-12-22 12:57:29 +00:00
Matt Jankowski	e6e217fedd	Clean up tagged_with_* Status specs, fix RSpec/LetSetup cop (#28462)	2023-12-22 08:32:27 +00:00
Matt Jankowski	513d35969e	Fix RSpec/LetSetup cop in auth controller specs (#28464)	2023-12-22 08:03:59 +00:00
Claire	92aa6e2ec9	Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream	2023-12-21 19:42:13 +01: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	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
Matt Jankowski	9251779d75	Fix RSpec/LetSetup cop in spec/services (#28459)	2023-12-21 14:23:53 +00:00
Matt Jankowski	efd16f3c2c	Clean up of RSpec/LetSetup within spec/services/activitypub (#28445)	2023-12-21 11:20:12 +00:00
Matt Jankowski	c99f88e1a8	Clean up of RSpec/LetSetup within spec/lib (#28447)	2023-12-21 11:19:56 +00:00
Matt Jankowski	cd64a5b2ec	Clean up of RSpec/LetSetup within api/ (#28448)	2023-12-21 10:10:18 +00:00
Matt Jankowski	f32d672d2f	Clean up of RSpec/LetSetup within spec/controllers (#28446)	2023-12-21 09:28:41 +00:00
Matt Jankowski	c753b1ad35	Clean up of RSpec/LetSetup within spec/models (#28444)	2023-12-21 09:18:38 +00:00
Matt Jankowski	2463b53363	More duplicates in cli maintenance spec, misc bug fixes (#28449)	2023-12-21 08:51:03 +00: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	8a5f2442cc	Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream	2023-12-20 21:58:18 +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
Matt Jankowski	961d65aba6	Add coverage to CLI Maintenance for duplicate users on confirmation_token and reset_password_token values (#28434)	2023-12-20 08:54:04 +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	6c00d5b0c4	Fix test failure caused by glitch-soc changes	2023-12-19 21:14:39 +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	d288a6162a	Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream	2023-12-19 20:40:05 +01:00
Claire	b24f676cf1	Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream	2023-12-19 20:24:57 +01:00
Claire	3ad92e8d0d	Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream	2023-12-19 20:17:23 +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
Claire	6fed0fcbaa	Remove unneeded settings cleanup from specs (#28425)	2023-12-19 15:17:22 +00:00
Matt Jankowski	c7c727994a	Add spec for CLI::Maintenance#fix_duplicates (#28326)	2023-12-19 13:10:33 +00: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
Matt Jankowski	c28976d89e	Handle negative offset param in api/v2/search (#28282)	2023-12-19 10:55:39 +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