3136 commits

Author	SHA1	Message	Date
Claire	89f89d738f	Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385)	2024-05-21 08:56:08 +00:00
Jeremy Kescher	fae98d1deb	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js	2024-05-20 23:57:04 +02:00
Claire	20fdf8e22c	Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream	2024-05-20 17:47:48 +02:00
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