887 Commits

Author	SHA1	Message	Date
Claire	6c99479ef4	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.	2023-06-18 13:41:33 +02:00
Claire	65cbcce997	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream	2023-06-18 10:36:14 +02:00
Daniel M Brasil	b10c05e702	Migrate to request specs in /api/v1/lists (#25443)	2023-06-15 10:19:51 +02:00
Matt Jankowski	4c5aa0e470	Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop (#24698)	2023-06-14 16:44:37 +02:00
Daniel M Brasil	24015ef0cc	Migrate to request specs in /api/v1/domain_blocks (#25414)	2023-06-14 16:08:53 +02:00
Daniel M Brasil	87aff5aad8	Migrate to request specs in /api/v1/follow_requests (#25411)	2023-06-14 15:43:50 +02:00
Daniel M Brasil	a5b62e56d0	Migrate to request specs in /api/v1/apps/verify_credentials (#25404)	2023-06-14 09:48:57 +02:00
Daniel M Brasil	a6407aa662	Migrate to request specs in /api/v1/apps (#25401)	2023-06-14 09:48:48 +02:00
Matt Jankowski	4c5f62de99	Extract shared examples from api specs (#25387)	2023-06-14 09:34:01 +02:00
Claire	ec59166844	Fix ArgumentError when loading newer Private Mentions (#25399)	2023-06-14 08:54:52 +02:00
Matt Jankowski	62c996b52d	Reduce RSpec/MultipleExpectations cop max to 8 (#25313)	2023-06-10 18:38:22 +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
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	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	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
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
Claire	e9385e93e9	Add a confirmation screen when suspending a domain (#25144)	2023-06-01 09:37:38 +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	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
Claire	0669783da8	Merge branch 'main' into glitch-soc/merge-upstream	2023-05-28 17:01:25 +02:00
Claire	0e7466717f	Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: We removed it from glitch-soc. Keep it deleted.	2023-05-28 16:41:14 +02:00
Claire	6dbd44faea	Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream	2023-05-28 15:01:53 +02:00
Matt Jankowski	0f2c16ac4b	Fix RSpec/NoExpectationExample cop (#25103)	2023-05-26 09:41:12 +02:00
Claire	e2ab9d4dad	Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00
Claire	2e02d03524	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	2023-05-25 22:59:30 +02:00
Claire	f959f6cdbb	Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream	2023-05-25 22:18:55 +02:00
Claire	b735954971	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.	2023-05-25 20:43:25 +02:00
Matt Jankowski	d2e5430d4a	Fix RSpec/ExpectChange cop (#25101)	2023-05-24 11:23:40 +02:00
Matt Jankowski	b896b16cb3	Fix RSpec/PredicateMatcher cop (#25102)	2023-05-23 16:49:11 +02:00
Matt Jankowski	778e4a7bf7	Fix RSpec/ExpectInHook cop (#25100)	2023-05-23 16:40:21 +02:00
Matt Jankowski	2877c80dbc	Add specs for admin/announcements CRUD actions (#25077)	2023-05-23 10:03:51 +02:00
Daniel M Brasil	b473df9a14	Improve test coverage for /api/v1/featured_tags (#25076)	2023-05-23 09:01:11 +02:00
Daniel M Brasil	4a22e72b9b	Improve test coverage for /api/v1/admin/canonical_email_blocks (#24985)	2023-05-22 15:27:35 +02:00
Daniel M Brasil	ce8b5899ae	Fix POST /api/v1/admin/domain_allows returning 200 when no domain is specified (#24958)	2023-05-22 13:44:49 +02:00
Matt Jankowski	e328ab7e5a	Implement pending specs for StatusesController (#23969)	2023-05-22 13:43:05 +02:00
Daniel M Brasil	f3feb4c891	Improve test coverage for /api/v1/admin/email_domain_blocks (#25017)	2023-05-22 13:28:11 +02:00
Daniel M Brasil	d51464283c	Improve test coverage for /api/v1/admin/ip_blocks_controller (#25031)	2023-05-22 12:50:44 +02:00
Nick Schonning	99e2e9b81f	Fix minor typos in comments and spec names (#21831)	2023-05-19 17:13:29 +02:00
Claire	e60414792d	Add polling and automatic redirection to /start on email confirmation (#25013)	2023-05-16 18:03:52 +02:00