389 commits

Author	SHA1	Message	Date
Claire	9ae60f8738	Merge commit '82e477b184' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.	2023-07-12 16:03:05 +02:00
Claire	dd0002e1fe	Merge commit '610cf6c371' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.	2023-07-12 15:38:35 +02:00
Matt Jankowski	6c5a2233a8	Fix RSpec/StubbedMock cop (#25552) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-07-12 10:20:10 +02:00
Matt Jankowski	cf33028f35	Admin mailer parameterization (#25759)	2023-07-08 20:03:38 +02:00
Claire	5de49e74d4	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-05 12:01:26 +02:00
Daniel M Brasil	383c00819c	Fix /api/v2/search not working with following query param (#25681)	2023-07-03 18:06:57 +02:00
Claire	44e98a2740	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-02 11:49:08 +02:00
Daniel M Brasil	4fe2d7cb59	Fix HTTP 500 in /api/v1/emails/check_confirmation (#25595)	2023-07-02 00:05:44 +02:00
Matt Jankowski	683ba5ecb1	Fix rails rewhere deprecation warning in directories api controller (#25625)	2023-07-01 21:48:16 +02:00
Claire	178e151019	Merge commit '55e7c08a83' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars.	2023-06-25 14:27:38 +02:00
Claire	a5b6f6da80	Change /api/v1/statuses/:id/history to always return at least one item (#25510)	2023-06-22 14:56:14 +02:00
Matt Jankowski	05f9e39b32	Fix RSpec/VerifiedDoubles cop (#25469)	2023-06-22 14:55:22 +02:00
Daniel M Brasil	6ac271c2a0	Migrate to request specs in /api/v1/suggestions (#25540)	2023-06-22 11:49:35 +02:00
Claire	ebfeaebedb	Fix /api/v1/conversations sometimes returning empty accounts (#25499)	2023-06-20 18:32:26 +02:00
Daniel M Brasil	e53eb38a8d	Migrate to request specs in /api/v1/admin/account_actions (#25514)	2023-06-20 18:16:48 +02:00
Matt Jankowski	e835198b26	Combine assertions in api/v1/notifications spec (#25486)	2023-06-19 09:05:42 +02:00
Daniel M Brasil	b9bc9d0bda	Fix incorrect pagination headers in /api/v2/admin/accounts (#25477)	2023-06-19 08:53:05 +02:00
Daniel M Brasil	0a0a1f1495	Migrate to request specs in /api/v1/tags (#25439)	2023-06-19 08:51:40 +02:00
Claire	6c99479ef4	Merge commit '9e245d147b' 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 '39110d1d0a' 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
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 '16dd3f08c1' 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 'b85c387c5c' 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	93c714417f	Merge commit 'b922ad7a1b' 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
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
Claire	6dbd44faea	Merge commit 'b896b16cb3' into glitch-soc/merge-upstream	2023-05-28 15:01:53 +02:00
Claire	e2ab9d4dad	Merge commit 'e387175fc9' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00
Claire	2e02d03524	Merge commit '4a22e72b9b' into glitch-soc/merge-upstream	2023-05-25 22:59:30 +02:00
Claire	f959f6cdbb	Merge commit 'e60414792d' into glitch-soc/merge-upstream	2023-05-25 22:18:55 +02:00
Claire	b735954971	Merge commit '2ce0b666a1' 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	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
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