2163 commits

Author	SHA1	Message	Date
Claire	65cbcce997	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream	2023-06-18 10:36:14 +02:00
Matt Jankowski	10746af82f	Remove unused shared examples for scoped settings (#25389)	2023-06-13 14:59:04 +02:00
Matt Jankowski	25c66fa640	Enable paperclip for account attachment examples (#25381)	2023-06-12 17:37:43 +02:00
Claire	42a0898f16	Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.	2023-06-10 18:42:29 +02:00
Matt Jankowski	62c996b52d	Reduce RSpec/MultipleExpectations cop max to 8 (#25313)	2023-06-10 18:38:22 +02:00
Matt Jankowski	b5675e265e	Add coverage for CLI::Feeds command (#25319)	2023-06-10 18:37:36 +02:00
Matt Jankowski	07933db788	Add coverage for CLI::Cache command (#25238)	2023-06-10 18:36:09 +02:00
fusagiko / takayamaki	b19a695608	migrate test for GET /api/v1/accounts/{account_id} to request spec (#25322)	2023-06-10 18:33:24 +02:00
Daniel M Brasil	99216e34e5	Migrate to request specs in /api/v1/admin/canonical_email_blocks (#25330)	2023-06-10 18:33:02 +02:00
Daniel M Brasil	b4e19f9610	Migrate to request specs in /api/v1/admin/ip_blocks (#25331)	2023-06-10 18:32:46 +02:00
Daniel M Brasil	4301d8cbb3	Migrate to request specs in /api/v1/admin/domain_allows (#25333)	2023-06-10 18:32:26 +02:00
Daniel M Brasil	841c220c40	Migrate to request specs in /api/v1/admin/domain_blocks (#25335)	2023-06-10 18:32:07 +02:00
Daniel M Brasil	0e200d4e2f	Migrate to request specs in /api/v1/admin/reports (#25355)	2023-06-10 18:30:43 +02:00
Matt Jankowski	3a2a15c6ea	Use build where possible in fabricators (#25360)	2023-06-10 18:29:01 +02:00
Matt Jankowski	c94bb9ba9a	Disable paperclip processing in specs (#25359)	2023-06-10 18:27:35 +02:00
Claire	8c26d49cbd	Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream fixed a translation bug in the theme selector that is absent from glitch-soc due to our different theming system. Discarded upstream changes. - `streaming/index.js`: Upstream changed the signature of a function to change its return type. This is not a real conflict, the conflict being caused by an extra argument in glitch-soc's code. Applied upstream's change while keeping our extra argument.	2023-06-10 17:18:36 +02:00
Claire	c48ec9cb8c	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.	2023-06-10 16:48:01 +02:00
Claire	d8b0a732aa	Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components.	2023-06-10 16:22:14 +02:00
Claire	734e186717	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did *not* port the changes as I want to try something a bit different.	2023-06-10 15:32:29 +02:00
Claire	aa57f7e3e2	Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream	2023-06-10 15:17:08 +02:00
Claire	b27a9a5903	Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream	2023-06-10 15:09:19 +02:00
Claire	93c714417f	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream changed various script definitions in lines surrounding the one for `i18n:extract`, which had glitch-soc-specific changes. Updated the scripts as upstream did, while keeping our changes to `i18n:extract`.	2023-06-10 14:38:04 +02:00
Daniel M Brasil	4aff1d2974	Migrate to request specs in /api/v1/admin/email_domain_blocks (#25337)	2023-06-09 14:00:14 +02:00
Matt Jankowski	6c0e3f490a	Fix RSpec/MissingExampleGroupArgument cop (#25310)	2023-06-06 15:51:42 +02:00
Matt Jankowski	b74c3cd708	Fix RSpec/DescribedClass cop missed items (#25309)	2023-06-06 14:51:03 +02:00
Matt Jankowski	c42591356d	Fix RSpec/DescribedClass cop (#25104)	2023-06-06 13:58:33 +02:00
Matt Jankowski	1e243e2df7	Misc spec coverage for Admin:: area controllers (#25282)	2023-06-06 13:57:00 +02:00
Daniel M Brasil	eb6f8181e1	Add test coverage for Mastodon::CLI::Accounts#reset_relationships (#25194)	2023-06-06 13:37:09 +02:00
Matt Jankowski	b22bfae4f9	Add coverage for DomainBlock#public_domain method (#25283)	2023-06-06 13:34:04 +02:00
Eugen Rochko	4eda233e09	Add webhook templating (#23289) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-06-06 10:42:47 +02:00
Matt Jankowski	af135bddd0	Update Admin::Metrics::Measure classes for Rails 7 (#25236)	2023-06-05 20:46:04 +02:00
Matt Jankowski	3b21c13dcc	Rails 7 compatibility fix for Admin::Metrics::Dimension classes (#25277)	2023-06-05 16:52:33 +02:00
Daniel M Brasil	70cd2d6000	Add test coverage for Mastodon::CLI::Accounts#cull (#25250)	2023-06-05 14:51:25 +02:00
Claire	c22fc2fa80	Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's changes.	2023-06-05 13:25:22 +02:00
Darius Kazemi	bacb674921	Add exclusive lists (#22048) ... Co-authored-by: Liam Cooke <liam@liamcooke.com> Co-authored-by: John Holdun <john@johnholdun.com> Co-authored-by: Effy Elden <effy@effy.space> Co-authored-by: Lina Reyne <git@lina.pizza> Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-06-05 09:37:02 +02:00
Matt Jankowski	5c87c66504	Add coverage for CLI::CanonicalEmailBlocks command (#25239)	2023-06-05 08:20:18 +02:00
Daniel M Brasil	03a707f6a6	Add test coverage for Mastodon::CLI::Accounts#merge (#25199)	2023-06-05 08:16:12 +02:00
Renaud Chaput	b0780cfeed	Fix /share and cleanup and reorganize frontend locale loading (#25240)	2023-06-02 15:00:27 +02:00
Claire	8884d1ece0	Add support for importing lists (#25203)	2023-06-01 14:47:31 +02:00
Daniel M Brasil	2a353200ad	Add test coverage for Mastodon::CLI::Accounts#rotate (#25212)	2023-06-01 14:29:29 +02:00
Renaud Chaput	942d850b0a	Allow carets in URL search params (#25216)	2023-06-01 12:14:49 +02:00
Daniel M Brasil	f906e21a4f	Add test coverage for Mastodon::CLI::Accounts#refresh (#25196)	2023-06-01 10:01:09 +02:00
Matt Jankowski	f84037ae2b	Remove unused #hash_to_object method in SettingsHelper (#25213)	2023-06-01 09:47:05 +02:00
Claire	e9385e93e9	Add a confirmation screen when suspending a domain (#25144)	2023-06-01 09:37:38 +02:00
Claire	b922ad7a1b	Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component (#25018)	2023-06-01 09:23:28 +02:00
Christian Schmidt	69057467cb	Translate CW, poll options and media descriptions (#24175) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-06-01 00:10:21 +02:00
Matt Jankowski	b0104e4c33	Silence output to stdout during cli specs (#25211)	2023-05-31 20:01:11 +02:00
Daniel M Brasil	3c41547f49	Add test coverage for Mastodon::CLI::Accounts#backup (#25163)	2023-05-31 15:32:37 +02:00
Matt Jankowski	8b1bfaed3e	Add specs for admin/webhooks CRUD actions (#25133)	2023-05-31 15:23:49 +02:00
Matt Jankowski	665bb237a8	Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules (#25192)	2023-05-31 10:23:32 +02:00