2308 Commits (2514c0efa179327c2a62ece7a1d3b67ee7063aa8)

Author	SHA1	Message	Date
Claire	3581e4be49	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	3445bdfa45	Merge pull request from GHSA-9928-3cp5-93fm ... * Fix attachments getting processed despite failing content-type validation * Add a restrictive ImageMagick security policy tailored for Mastodon * Fix misdetection of MP3 files with large cover art * Reject unprocessable audio/video files instead of keeping them unchanged	1 year ago
Claire	784f2f35bc	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Daniel M Brasil	2b877ad937	Fix `/api/v2/search` not working with following query param (#25681)	1 year ago
Claire	0a6bc158bd	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Daniel M Brasil	2f17abc686	Fix HTTP 500 in `/api/v1/emails/check_confirmation` (#25595)	1 year ago
Matt Jankowski	843448c7d9	Fix rails `rewhere` deprecation warning in directories api controller (#25625)	1 year ago
Claire	85dc0869a5	Fix ResolveURLService not resolving local URLs for remote content (#25637)	1 year ago
jsgoldstein	5d75bf9846	Change account search to match by text when opted-in (#25599) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	1 year ago
Claire	ea57f8e3af	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	92fbaae7b6	Fix suspending an already-limited domain (#25603)	1 year ago
Claire	b7af3115a7	Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' 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.	1 year ago
Claire	d0144d2be3	Change /api/v1/statuses/:id/history to always return at least one item (#25510)	1 year ago
Matt Jankowski	011006c01b	Fix `RSpec/VerifiedDoubles` cop (#25469)	1 year ago
Matt Jankowski	a62df37800	Reduce `Admin::Reports::Actions` spec db activity (#25465)	1 year ago
Claire	c1c87fe7b9	Add finer permission requirements for managing webhooks (#25463)	1 year ago
Matt Jankowski	bb928d2f12	Speed-up on `StatusesController` spec (#25549)	1 year ago
Matt Jankowski	397f0cd5e3	Speed-up on `BackupService` spec (#25527)	1 year ago
Daniel M Brasil	33f3a9c5f5	Migrate to request specs in `/api/v1/suggestions` (#25540)	1 year ago
Claire	4e0718dbf5	Add per-test timeouts to AutoStatusesCleanupScheduler tests (#24841)	1 year ago
Claire	5e5af7a0fe	Fix /api/v1/conversations sometimes returning empty accounts (#25499)	1 year ago
Daniel M Brasil	88cdb02d89	Migrate to request specs in `/api/v1/admin/account_actions` (#25514)	1 year ago
Claire	923dde8e6c	Fix wrong view being displayed when a webhook fails validation (#25464)	1 year ago
Claire	4e861795a4	Add translate="no" to outgoing mentions and links (#25524)	1 year ago
Plastikmensch	02ff7c5f3d	Re-allow title attribute in <abbr> (#2254) ... * Re-allow title attribute in <abbr> This was accidentally removed in a6363c3a2a Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Add test Add a new test to check that title attribute on <abbr> is kept. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>	1 year ago
Claire	ecf17008e8	Fix user settings not getting validated (#25508)	1 year ago
Matt Jankowski	d05a68a12e	Reduce `sleep` time in request pool spec (#25470)	1 year ago
Matt Jankowski	ed134709aa	Add coverage for `UserMailer` methods (#25484)	1 year ago
Matt Jankowski	72542ce967	Combine assertions in api/v1/notifications spec (#25486)	1 year ago
Daniel M Brasil	498e3231b6	Fix incorrect pagination headers in `/api/v2/admin/accounts` (#25477)	1 year ago
Daniel M Brasil	a27a33ebde	Migrate to request specs in `/api/v1/tags` (#25439)	1 year ago
Claire	05adb637b7	Fix glitch-soc-only test being broken by refactor of the surrounding tests	1 year ago
Claire	7066e3d5ce	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' 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.	1 year ago
Claire	f101b67a45	Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream	1 year ago
Matt Jankowski	2bd353cdf5	Remove Ruby GC config from spec helper (#25455)	1 year ago
Daniel M Brasil	dc9352a450	Migrate to request specs in `/api/v1/lists` (#25443)	1 year ago
Matt Jankowski	eb1f69c2d4	Update rubocop-rspec to version 2.22.0, fix `RSpec/IndexedLet` cop (#24698)	1 year ago
Daniel M Brasil	507a7e785a	Migrate to request specs in `/api/v1/domain_blocks` (#25414)	1 year ago
Daniel M Brasil	895e157b4d	Migrate to request specs in `/api/v1/follow_requests` (#25411)	1 year ago
Daniel M Brasil	4a994e5b50	Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` (#25386)	1 year ago
Matt Jankowski	b47741bb29	Reduce factory data created in spec/models/trends/statuses spec (#25410)	1 year ago
Matt Jankowski	8c7da82c64	Speed improvement for `AccountsStatusesCleanupScheduler` spec (#25406)	1 year ago
Daniel M Brasil	943c99f780	Migrate to request specs in `/api/v1/apps/verify_credentials` (#25404)	1 year ago
Daniel M Brasil	51fdaefad4	Migrate to request specs in `/api/v1/apps` (#25401)	1 year ago
Matt Jankowski	bc7346ab9c	Extract shared examples from api specs (#25387)	1 year ago
Claire	a424076226	Fix ArgumentError when loading newer Private Mentions (#25399)	1 year ago
Matt Jankowski	6273d4f5ee	Remove unused shared examples for scoped settings (#25389)	1 year ago
Matt Jankowski	3fa5d7092e	Enable paperclip for account attachment examples (#25381)	1 year ago
Claire	1c25f35ddf	Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' 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.	1 year ago
Matt Jankowski	a3c439de66	Reduce `RSpec/MultipleExpectations` cop max to 8 (#25313)	1 year ago
Matt Jankowski	61a9504522	Add coverage for `CLI::Feeds` command (#25319)	1 year ago
Matt Jankowski	4d21dbfa23	Add coverage for `CLI::Cache` command (#25238)	1 year ago
fusagiko / takayamaki	c31e2b3267	migrate test for `GET /api/v1/accounts/{account_id}` to request spec (#25322)	1 year ago
Daniel M Brasil	e2323fdcf6	Migrate to request specs in `/api/v1/admin/canonical_email_blocks` (#25330)	1 year ago
Daniel M Brasil	e359a19387	Migrate to request specs in `/api/v1/admin/ip_blocks` (#25331)	1 year ago
Daniel M Brasil	9c7f3acaf6	Migrate to request specs in `/api/v1/admin/domain_allows` (#25333)	1 year ago
Daniel M Brasil	70cc460c39	Migrate to request specs in `/api/v1/admin/domain_blocks` (#25335)	1 year ago
Daniel M Brasil	1a723c3425	Migrate to request specs in `/api/v1/admin/reports` (#25355)	1 year ago
Matt Jankowski	23c3e09853	Use `build` where possible in fabricators (#25360)	1 year ago
Matt Jankowski	c4eba4b0d9	Disable paperclip processing in specs (#25359)	1 year ago
Claire	c51e8de4ad	Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' 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.	1 year ago
Claire	ee1de4206a	Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.	1 year ago
Claire	085a1197da	Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' 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.	1 year ago
Claire	3b87fe21fa	Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' 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.	1 year ago
Claire	e6b6a0535e	Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream	1 year ago
Claire	13b84da439	Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream	1 year ago
Claire	447b44a5d6	Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' 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`.	1 year ago
Daniel M Brasil	14fa204dfc	Migrate to request specs in `/api/v1/admin/email_domain_blocks` (#25337)	1 year ago
Matt Jankowski	23d64073d0	Fix RSpec/MissingExampleGroupArgument cop (#25310)	1 year ago
Matt Jankowski	dd76368f72	Fix `RSpec/DescribedClass` cop missed items (#25309)	1 year ago
Matt Jankowski	8e745a234c	Fix `RSpec/DescribedClass` cop (#25104)	1 year ago
Matt Jankowski	09b05d7e8b	Misc spec coverage for `Admin::` area controllers (#25282)	1 year ago
Daniel M Brasil	a66827421b	Add test coverage for `Mastodon::CLI::Accounts#reset_relationships` (#25194)	1 year ago
Matt Jankowski	0aebcd4761	Add coverage for `DomainBlock#public_domain` method (#25283)	1 year ago
Eugen Rochko	2252e4d8bb	Add webhook templating (#23289) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Matt Jankowski	14dc8a6a5f	Update `Admin::Metrics::Measure` classes for Rails 7 (#25236)	1 year ago
Matt Jankowski	c74040abfa	Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes (#25277)	1 year ago
Daniel M Brasil	a274d79f58	Add test coverage for `Mastodon::CLI::Accounts#cull` (#25250)	1 year ago
Claire	bda5be1406	Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's changes.	1 year ago
Darius Kazemi	6debddcf89	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>	1 year ago
Matt Jankowski	9c86b994db	Add coverage for CLI::CanonicalEmailBlocks command (#25239)	1 year ago
Daniel M Brasil	427661c9eb	Add test coverage for `Mastodon::CLI::Accounts#merge` (#25199)	1 year ago
Renaud Chaput	29851c83bd	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	1 year ago
Claire	572086c8ad	Add support for importing lists (#25203)	1 year ago
Daniel M Brasil	269812919e	Add test coverage for `Mastodon::CLI::Accounts#rotate` (#25212)	1 year ago
Renaud Chaput	f681f81cbf	Allow carets in URL search params (#25216)	1 year ago
Daniel M Brasil	6f0217d056	Add test coverage for `Mastodon::CLI::Accounts#refresh` (#25196)	1 year ago
Matt Jankowski	a6f0456756	Remove unused #hash_to_object method in SettingsHelper (#25213)	1 year ago
Claire	8ee98cfd2b	Add a confirmation screen when suspending a domain (#25144)	1 year ago
Claire	52b4e33d7f	Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component (#25018)	1 year ago
Christian Schmidt	971eafc709	Translate CW, poll options and media descriptions (#24175) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Matt Jankowski	3b2e804a83	Silence output to stdout during cli specs (#25211)	1 year ago
Daniel M Brasil	fc30a59e10	Add test coverage for `Mastodon::CLI::Accounts#backup` (#25163)	1 year ago
Matt Jankowski	216298a400	Add specs for admin/webhooks CRUD actions (#25133)	1 year ago
Matt Jankowski	93f7408c10	Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules (#25192)	1 year ago
Daniel M Brasil	ac9089805f	Add test coverage for `Mastodon::CLI::Accounts#unfollow` (#25162)	1 year ago
Daniel M Brasil	66b7c04b62	Add test coverage for `Mastodon::CLI::Accounts#follow` (#25161)	1 year ago
Daniel M Brasil	0c652b4b6d	Add test coverage for `Mastodon::CLI::Accounts#approve` (#25160)	1 year ago
Daniel M Brasil	ba924d4642	Add test coverage for `Mastodon::CLI::Accounts#delete` (#25146)	1 year ago
Daniel M Brasil	ad3f504a21	Add test coverage for `Mastodon::CLI::Accounts#modify` (#25145)	1 year ago
Daniel M Brasil	dd0d755824	Add test coverage for `Mastodon::CLI::Accounts#create` (#25143)	1 year ago
Claire	53b8a15ee9	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	973743ff50	Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: We removed it from glitch-soc. Keep it deleted.	1 year ago
Claire	006bc485e4	Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream	1 year ago
Matt Jankowski	1411f75aae	Fix RSpec/NoExpectationExample cop (#25103)	1 year ago
Claire	ab642ee227	Fix glitch-soc-only tests being broken because of test refactor	1 year ago
Claire	569302e5ce	Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream	1 year ago
Claire	ee6f9d2c92	Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream	1 year ago
Claire	560f605dc2	Merge commit '86961b5b7b459fd778a9b697bbdfbda03512babb' into glitch-soc/merge-upstream	1 year ago
Claire	11368da545	Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' 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.	1 year ago
Matt Jankowski	f97a429d20	Add CLI Base class for command line code (#25106)	2 years ago
Matt Jankowski	bc1dae0bc4	Fix RSpec/ExpectChange cop (#25101)	2 years ago
Matt Jankowski	3e747f0863	Fix RSpec/PredicateMatcher cop (#25102)	2 years ago
Matt Jankowski	15e143106e	Fix RSpec/ExpectInHook cop (#25100)	2 years ago
Matt Jankowski	eada85f715	Move the mastodon/*_cli files to mastodon/cli/* (#24139)	2 years ago
Matt Jankowski	1361e4cb7a	Add request spec for backups download (#25099)	2 years ago
Matt Jankowski	adaa7a61e9	Fix RSpec/RepeatedExample cop (#24849)	2 years ago
Matt Jankowski	9e8323fdb9	Fix Performance/MapCompact cop (#24797) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Matt Jankowski	0087959e0b	Add specs for admin/announcements CRUD actions (#25077)	2 years ago
Daniel M Brasil	ffce0d14bd	Improve test coverage for `/api/v1/featured_tags` (#25076)	2 years ago
Claire	c59cbf1a38	Fix account confirmation flow not returning to app after captcha validation (#25057)	2 years ago
Daniel M Brasil	cc5d2e22dd	Improve test coverage for `/api/v1/admin/canonical_email_blocks` (#24985)	2 years ago
Daniel M Brasil	4d07793150	Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified (#24958)	2 years ago
Matt Jankowski	e0e7e73cb4	Implement pending specs for StatusesController (#23969)	2 years ago
Daniel M Brasil	67d0dfbc67	Improve test coverage for `/api/v1/admin/email_domain_blocks` (#25017)	2 years ago
Emelia Smith	8b4d7b22ed	Allow reports with long comments from remote instances, but truncate (#25028)	2 years ago
Daniel M Brasil	90466ee43a	Improve test coverage for `/api/v1/admin/ip_blocks_controller` (#25031)	2 years ago
Nick Schonning	c4f2b1e86a	Fix minor typos in comments and spec names (#21831)	2 years ago
Claire	9011b008c2	Add tests for avatar/header in backup service (#25037)	2 years ago
Matt Jankowski	9082e53002	Add spec for migration warning module (#25033)	2 years ago
Claire	86961b5b7b	Add polling and automatic redirection to `/start` on email confirmation (#25013)	2 years ago
Claire	99f1302cc3	Fix reports not being closed when performing batch suspensions (#24988)	2 years ago
Matt Jankowski	74c77c5274	Remove usage of random sample values in specs (#24869)	2 years ago
Matt Jankowski	540b446f77	Replace i18n view spec with helper spec (#24966)	2 years ago
Matt Jankowski	42ca35dcbc	I18n pluralization errors (#24963)	2 years ago
Daniel M Brasil	7cf0ce19e2	Fix uncaught NoMethodError error in `/api/v1/admin/canonical_email_blocks/test` (#24947) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	c8998a2678	Change profile updates to be sent to recently-mentioned servers (#24852)	2 years ago
Matt Jankowski	2500233709	Fix RSpec/RepeatedExampleGroupDescription cop (#24850) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Matt Jankowski	bf1a16e278	Fix RSpec/SharedContext cop (#24847)	2 years ago
Matt Jankowski	1598cf9043	Fix RSpec/ScatteredSetup cop (#24848)	2 years ago
Daniel M Brasil	9c5c803c7c	Add test coverage for `Mastodon::IpBlocksCLI` (#24935)	2 years ago
Claire	c752e939d5	Change AccessTokensVacuum to also delete expired tokens (#24868)	2 years ago
Claire	da25a0bd04	Fix rubocop issues in glitch-soc-specific code	2 years ago
Claire	348aed03cf	Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' 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.	2 years ago
Claire	2aaf3528ca	Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' 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.	2 years ago
Daniel M Brasil	a82a6882ad	Add test coverage for `Mastodon::SettingsCLI` (#24856)	2 years ago
Claire	53e3a1b06d	Fix infinite loop in AccountsStatusesCleanupScheduler (#24840)	2 years ago
Nick Schonning	2f2c8f671b	Autofix Rubocop Style/HashSyntax (#23754)	2 years ago
Nick Schonning	dfbb3a61c9	Enable Rubocop Rails/FilePath (#23854)	2 years ago
Matt Jankowski	cf86cc68b7	Fix RSpec/InferredSpecType cop (#24736)	2 years ago