2,097 commits

Author	SHA1	Message	Date
Claire	61f6cd45e3	Fix glitch-soc-only tests being broken because of test refactor	2023-05-26 00:10:57 +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	e387175fc9	Fix RSpec/RepeatedExample cop (#24849)	2023-05-23 10:49:23 +02:00
Matt Jankowski	9f5deb310b	Fix Performance/MapCompact cop (#24797) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-05-23 10:49:12 +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
Claire	2a61f14753	Fix account confirmation flow not returning to app after captcha validation (#25057)	2023-05-22 17:38:05 +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
Emelia Smith	19f9098551	Allow reports with long comments from remote instances, but truncate (#25028)	2023-05-22 13:15:21 +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	b805b7f021	Add tests for avatar/header in backup service (#25037)	2023-05-19 12:04:18 +02:00
Matt Jankowski	d34d94d08f	Add spec for migration warning module (#25033)	2023-05-19 10:53:50 +02:00
Claire	e60414792d	Add polling and automatic redirection to /start on email confirmation (#25013)	2023-05-16 18:03:52 +02:00
Claire	3ed3d54bf3	Fix reports not being closed when performing batch suspensions (#24988)	2023-05-16 14:56:49 +02:00
Matt Jankowski	604e1c2b11	Remove usage of random sample values in specs (#24869)	2023-05-15 20:20:13 +02:00
Matt Jankowski	b84bc2de5d	Replace i18n view spec with helper spec (#24966)	2023-05-15 17:25:04 +02:00
Matt Jankowski	679aca46da	I18n pluralization errors (#24963)	2023-05-12 18:53:30 +02:00
Daniel M Brasil	433ab0c9a3	Fix uncaught NoMethodError error in /api/v1/admin/canonical_email_blocks/test (#24947) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-05-12 13:46:16 +02:00
Claire	9015c2d646	Change profile updates to be sent to recently-mentioned servers (#24852)	2023-05-12 13:13:04 +02:00
Matt Jankowski	2c2d924942	Fix RSpec/RepeatedExampleGroupDescription cop (#24850) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-05-12 12:25:32 +02:00
Matt Jankowski	bf3ebeb42f	Fix RSpec/SharedContext cop (#24847)	2023-05-12 09:25:43 +02:00
Matt Jankowski	a610a02d4f	Fix RSpec/ScatteredSetup cop (#24848)	2023-05-11 10:32:09 +02:00
Daniel M Brasil	9cbda99941	Add test coverage for Mastodon::IpBlocksCLI (#24935)	2023-05-11 10:19:24 +02:00
Claire	6b0942d107	Change AccessTokensVacuum to also delete expired tokens (#24868)	2023-05-11 04:40:03 +02:00
Claire	8b31030fe4	Fix rubocop issues in glitch-soc-specific code	2023-05-08 19:28:43 +02:00
Claire	d77fbbed73	Merge commit 'f877aa9d70' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests.	2023-05-08 19:28:21 +02:00
Claire	2d029dedd9	Merge commit '0ad2413b35' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.	2023-05-08 15:28:36 +02:00
Daniel M Brasil	c9210af3ee	Add test coverage for Mastodon::SettingsCLI (#24856)	2023-05-04 20:37:42 +02:00
Claire	c3c7d59072	Fix infinite loop in AccountsStatusesCleanupScheduler (#24840)	2023-05-04 10:13:00 +02:00
Nick Schonning	da3bd913ae	Autofix Rubocop Style/HashSyntax (#23754)	2023-05-04 05:54:26 +02:00
Nick Schonning	1fe04f740a	Enable Rubocop Rails/FilePath (#23854)	2023-05-04 05:50:40 +02:00
Matt Jankowski	c97b611b6b	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
Matt Jankowski	710745e16b	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
Matt Jankowski	cf18cc2891	Fix RSpec/MultipleSubjects cop (#24738)	2023-05-04 05:48:35 +02:00
Matt Jankowski	bdcd8a9e88	Misc spec cleanup (#24822)	2023-05-04 05:47:52 +02:00
Matt Jankowski	08fb9d300a	Spec coverage for settings/preferences/* controllers (#24825)	2023-05-04 05:44:27 +02:00
Claire	a2a22bad23	Fix various edge cases with local moves (#24812)	2023-05-03 19:19:25 +02:00
Claire	1e75eb690d	Fix own posts not getting delivered to own lists (#24810)	2023-05-03 19:17:40 +02:00
Claire	c98b012583	Change Move handler to also move list memberships (#24808)	2023-05-03 14:03:38 +02:00
Matt Jankowski	3df665fd23	Fix Lint/ConstantDefinitionInBlock cop (#24763)	2023-05-03 10:32:30 +02:00
Claire	8b636a29c6	Improve automatic post cleanup worker performances (#24785)	2023-05-03 10:31:40 +02:00
Matt Jankowski	a0c9f2447e	Fix Performance/MethodObjectAsBlock cop (#24798)	2023-05-03 10:30:54 +02:00
Matt Jankowski	97385f27bd	Fix Performance/RedundantEqualityComparisonBlock cop (#24799)	2023-05-03 10:30:10 +02:00