1347 Commits (main)

Author	SHA1	Message	Date
Renaud Chaput	4d1b67f664	Add end-to-end (system) tests (#25461)	10 months ago
Misty De Méo	12a6cf569e	Storage: add :azure to remaining callers (#26080)	10 months ago
Claire	b4e739ff0f	Change interaction modal in web UI (#26075) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	10 months ago
Claire	f2c683336b	Bump version to v4.1.5 (#26108)	10 months ago
Renaud Chaput	42698b4c5c	Fix the crossorigin attribute (#26096)	10 months ago
Claire	9ae60f8738	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' 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.	10 months ago
Matt Jankowski	f831452037	Refactor `Snowflake` to avoid brakeman sql injection warnings (#25879)	10 months ago
Matt Jankowski	b8b2470cf8	Fix `Style/SlicingWithRange` cop (#25923)	10 months ago
Nick Schonning	1d557305d2	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	10 months ago
anna	d6845d08d7	bump to nyastodon 1.2.2	10 months ago
anna	b4e8f17031	bump to nyastodon 1.2.1	10 months ago
anna	ddbdcaf0f8	bump to nyastodon 1.2.0	10 months ago
anna	0fbd6c586a	merge with catstodon/main	10 months ago
Jeremy Kescher	037fcd9d31	Merge branch 'glitch-soc' into develop	11 months ago
Claire	b9aa228c54	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream attempted something with tags. Kept our version.	11 months ago
Claire	0051128387	Bump version to v4.1.4 (#25805)	11 months ago
Claire	71d44949bf	Fix branding:generate_app_icons failing because of disallowed ICO coder (#25794)	11 months ago
anna	f3932cf879	bump to nyastodon 1.1.11	11 months ago
anna	6b7b0d5b15	merge with catcatnya/main	11 months ago
Local User	0527458f38	Merge branch 'upstream/main' into develop	11 months ago
Claire	ff7aae3037	Merge branch 'main' into glitch-soc/merge-upstream	11 months ago
Claire	5e1752ce3f	Bump version to v4.1.3 (#25757)	11 months ago
Claire	dc8f1fbd97	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	11 months ago
Claire	6d8e0fae3e	Merge pull request from GHSA-ccm4-vgcc-73hp ... * Tighten allowed HTML in oEmbed-based preview cards * Sanitize preview cards at render time * Add `sandbox` attribute to preview card iframes	11 months ago
Claire	fed9cbfd2b	Add hardened headers to user-uploaded files (#25756)	11 months ago
anna	47a672b898	bump to nyastodon 1.1.10	11 months ago
anna	ea737d53d4	fix nyastodon version string	11 months ago
anna	b4fa21bce4	merge catcatnya/main into main	11 months ago
Claire	178e151019	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' 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.	11 months ago
Claire	c78280a8ce	Add translate="no" to outgoing mentions and links (#25524)	11 months ago
Plastikmensch	eba3411bfa	Re-allow title attribute in <abbr> (#2254) ... * Re-allow title attribute in <abbr> This was accidentally removed in 7623e18124 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>	11 months ago
Claire	65cbcce997	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream	11 months ago
Matt Jankowski	b5675e265e	Add coverage for `CLI::Feeds` command (#25319)	11 months ago
Matt Jankowski	07933db788	Add coverage for `CLI::Cache` command (#25238)	11 months ago
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.	11 months ago
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.	11 months ago
Claire	aa57f7e3e2	Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream	11 months ago
Nick Schonning	c66250abf1	Autofix Rubocop Regex Style rules (#23690) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	12 months ago
Claire	c22fc2fa80	Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's changes.	12 months ago
Jed Fox	768b00c4d0	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	12 months ago
Matt Jankowski	cd4f0feab8	Extract verify options method in search cli (#25121)	12 months ago
Matt Jankowski	35c1c3e57a	Add CLI area progress bar helper (#25208)	12 months ago
Matt Jankowski	dc26140d54	Use thor methods instead of tty prompt in maintenance cli (#25207)	12 months ago
Matt Jankowski	1baf40077b	Fix FormatStringToken cop in CLI (#25122)	12 months ago
Matt Jankowski	80c7de9984	Fix Rails/WhereExists cop in CLI (#25123)	12 months ago
Matt Jankowski	b7b96efd17	Extract helper method for error report in cli/accounts command (#25119)	12 months ago
Matt Jankowski	2cecb2dc9e	Increment index which was previously not used in maintenance CLI loop (#25118)	12 months ago
Matt Jankowski	ec9bc7e604	Consistent usage of CLI `dry_run?` method (#25116)	12 months ago
Claire	0669783da8	Merge branch 'main' into glitch-soc/merge-upstream	12 months ago
Claire	0e7466717f	Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: We removed it from glitch-soc. Keep it deleted.	12 months ago
Claire	6dbd44faea	Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream	12 months ago
Jeremy Kescher	2bcce397a9	Bump version	12 months ago
Jeremy Kescher	4920ccb302	Merge remote-tracking branch 'upstream/main' into develop	12 months ago
Matt Jankowski	55785b1603	Extract methods for user de-duping in maintenance CLI (#25117)	12 months ago
Claire	2e02d03524	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	1 year ago
Claire	1d588d58f1	Improve various queries against account domains (#25126)	1 year ago
Matt Jankowski	384345b0de	Add CLI Base class for command line code (#25106)	1 year ago
Matt Jankowski	b6b4ea4ca5	Move the mastodon/*_cli files to mastodon/cli/* (#24139)	1 year ago
Nick Schonning	99e2e9b81f	Fix minor typos in comments and spec names (#21831)	1 year ago
Jeremy Kescher	f158fb7151	ReactionsController: Don't check for status reaction existence in destroy ... UnreactService checks for its existence in the background anyway, so remove redundant checks.	1 year ago
Jeremy Kescher	4252c6fe1e	Revert "Redo StatusReaction set_custom_emoji to be similar to AnnouncementReaction" ... This reverts commit b8774d3b5d, to address a regression when trying to react with non-local custom emoji.	1 year ago
Jeremy Kescher	0a67076fa9	Bump version	1 year ago
Jeremy Kescher	9fe04326ea	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # config/routes.rb # db/schema.rb # lib/mastodon/version.rb	1 year ago
Claire	1a664560cc	Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes.	1 year ago
Daniel M Brasil	536dd046d4	Add ability to block sign-ups from IP using the CLI (#24870)	1 year ago
Daniel M Brasil	ffb3fef7db	Fix uncaught `ActiveRecord::StatementInvalid` in Mastodon::IpBlocksCLI (#24861)	1 year ago
Jeremy Kescher	d183f8c306	Bump version	1 year ago
Claire	8b31030fe4	Fix rubocop issues in glitch-soc-specific code	1 year ago
Claire	d77fbbed73	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' 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.	1 year ago
Jeremy Kescher	f1a71785b9	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Claire	2d029dedd9	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' 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.	1 year ago
Jeremy Kescher	628c027049	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Jeremy Kescher	9eb149477a	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Renaud Chaput	830e6cefae	Add version suffixes to nightly & edge image builds (#24823)	1 year ago
Nick Schonning	569b39256b	Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml (#24469)	1 year ago
Nick Schonning	da3bd913ae	Autofix Rubocop Style/HashSyntax (#23754)	1 year ago
Matt Jankowski	2c6c398c60	Fix Performance/CollectionLiteralInLoop cop (#24819)	1 year ago
Matt Jankowski	24491abf6d	Fix Rails/DeprecatedActiveModelErrorsMethods cop (#24742)	1 year ago
Matt Jankowski	5e060e1f44	Fix Performance/Sum cop (#24788)	1 year ago
Claire	1ed0ff30d3	Fix `tootctl accounts cull` crashing when encountering a domain resolving to a private address (#23378)	1 year ago
Matt Jankowski	88d33f361f	Fix Lint/DuplicateBranch cop (#24766)	1 year ago
Daniel M Brasil	e8fe941015	Fix `tootctl accounts approve --number N` not aproving N earliest registrations (#24605)	1 year ago
Matt Jankowski	2e43461100	Fix Rails/Output cop (#24687)	1 year ago
Matt Jankowski	60ac9e8634	Fix Rails/SquishedSQLHeredocs cop (#24694)	1 year ago
Claire	12b935fadf	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.	1 year ago
Daniel M Brasil	1d9969fadf	Fix `tootctl accounts create --reattach --force` not working with confirmed accounts (#24680)	1 year ago
Jeremy Kescher	1fb6e312ff	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Claire	528b8e7e3a	Fix crash in `tootctl accounts create --reattach --force` (#24557)	1 year ago
Jeremy Kescher	f3953eee78	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Claire	abfdafef1e	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.	1 year ago
Jeremy Kescher	b87c94d437	Bump patch version	1 year ago
Jeremy Kescher	3866d53b95	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Daniel M Brasil	faf657d709	Fix uncaught ActiveRecord::StatementInvalid exception in `Mastodon::AccountsCLI#approve` (#24590)	1 year ago
Eugen Rochko	e98c86050a	Refactor `Cache-Control` and `Vary` definitions (#24347)	1 year ago
Daniel M Brasil	3afa1fda7a	Fix email confirmation skip option in `tootctl accounts modify USERNAME --email EMAIL --confirm` (#24578)	1 year ago
Claire	f9a9f9344b	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Daniel M Brasil	b0800d602e	tootctl: add --approve option to tootctl accounts create (#24533)	1 year ago
Jeremy Kescher	197a51ec07	Bump version to v4.1.2+1.0.1	1 year ago
Matt Jankowski	a2a66300d9	Clean up the post deployment migration generator (#24233)	1 year ago
Jeremy Kescher	1e866e57ac	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Claire	ce12934f5b	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.	1 year ago
Claire	ff168ef202	Fix most rubocop issues (#2165) ... * Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues * Run rubocop --autocorrect-all on db/ * Run rubocop --autocorrect-all on `spec/` and fix remaining issues	1 year ago
Jeremy Kescher	042671da67	Bump version to 4.1.1+1.0.7	1 year ago
Jeremy Kescher	cbd22f414a	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Claire	3d8bd093b9	Bump version to v4.1.2 (#24427)	1 year ago
Jeremy Kescher	198d0b2ed4	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock	1 year ago
Jeremy Kescher	9c4e0606d1	Fix appearance/show.html.haml	1 year ago
Jeremy Kescher	e4c411ef1a	Migrate emoji reactions	1 year ago
Jeremy Kescher	68101baae1	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/controllers/settings/preferences_controller.rb # app/javascript/mastodon/utils/resize_image.js # app/lib/user_settings_decorator.rb # app/models/media_attachment.rb # app/models/user.rb # app/views/settings/preferences/appearance/show.html.haml # app/workers/scheduler/indexing_scheduler.rb # config/settings.yml # db/schema.rb	1 year ago
Claire	4d5b4dacd6	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	5c499f54e3	Change root Chewy strategy to emit a warning instead of erroring out in production mode (#24327)	1 year ago
Alison Wheeler	2f7c3cb628	Update redis_config.rb to remove warning message (#24352)	1 year ago
Claire	01d6f7529f	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.	1 year ago
Jeremy Kescher	20d2a1938c	Bump Ruby version to 3.2.2 due to ReDOS vulnerabilities	1 year ago
Eugen Rochko	a9b5598c97	Change user settings to be stored in a more optimal way (#23630) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Jeremy Kescher	722b6697d7	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Claire	0d70deee53	Add migration tests for user mail notification settings (#24277)	1 year ago
Matt Jankowski	b9e34ef098	Migration warning helper, and only run in production env (#24253)	1 year ago
Jeremy Kescher	276e958dae	Reset suffix_version to 1.0.0	1 year ago
Jeremy Kescher	4ec0bd126b	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml	1 year ago
Claire	5ac380c122	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.	1 year ago
Claire	7f8e1bede4	Bump version to v4.1.1 (#24201)	1 year ago
Jeremy Kescher	60298487f1	Bump Catstodon version	1 year ago
Claire	bdeb6ff180	Fix crash in `tootctl` commands making use of parallelization when Elasticsearch is enabled (#24182)	1 year ago
Jeremy Kescher	2cb88f5baa	Merge remote-tracking branch 'upstream/main' into develop ... Conflicts: - .github/workflows/build-image.yml We don't use GitHub Actions for building Docker images. - Gemfile.lock Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.	1 year ago
Jeremy Kescher	255ea1c131	v4.1.0+2.0.5	1 year ago
Jeremy Kescher	24e9a23fe6	Merge remote-tracking branch 'upstream/main' into develop, bump version ... Conflicts: - .github/workflows/build-image.yml We're not building an image with GitHub Actions.	1 year ago
Claire	193250556c	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.	1 year ago
Nick Schonning	aa947a143b	Regen rubocop-todo without Max shadowing (#24076)	1 year ago
Eugen Rochko	f0e727f958	Add cache headers to static files served through Rails (#24120)	1 year ago
Nick Schonning	25d36b6edd	Autofix Rubocop Style/RedundantArgument (#23798)	1 year ago
Jeremy Kescher	ddc4022845	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js # app/lib/feed_manager.rb # app/services/batched_remove_status_service.rb # lib/mastodon/feeds_cli.rb	1 year ago
Claire	3ef5f62abf	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.	1 year ago
Claire	1d0ad558ff	Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034)	1 year ago
Nick Schonning	e762a14c0a	Enable Rubocop Performance/DeleteSuffix (#24077)	1 year ago
Claire	f432db7b9f	Fix sidekiq jobs not triggering Elasticsearch index updates (#24046)	1 year ago
9p4	b715bd8e53	Add refreshing many accounts at once with "tootctl accounts refresh" (#23304)	1 year ago
Jeremy Kescher	3158b0ac17	v4.1.0+2.0.2	1 year ago
Claire	7623e18124	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream README has been changed, but we have a completely different one. Kept our `README.md`. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Change the code style to match upstream's but otherwise do not change our code. - `spec/lib/sanitize_config_spec.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Kept our version, since the tests are mostly glitch-soc's, except for cases which are purposefuly different.	1 year ago
Jeremy Kescher	a79405d877	v4.1.0+2.0.1	1 year ago
Jeremy Kescher	7318b74ebf	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/models/notification.rb # config/locales/simple_form.de.yml	1 year ago
Jean byroot Boussier	922837dc96	Upgrade to latest redis-rb 4.x and fix deprecations (#23616) ... Co-authored-by: Jean Boussier <jean.boussier@gmail.com>	1 year ago
Claire	8784498ebf	Fix tootctl accounts migrate error due to typo (#23567)	1 year ago
Claire	3a6451c867	Add support for incoming rich text (#23913)	1 year ago
Claire	4ed09276d5	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.	1 year ago
Nick Schonning	8fd3fc404d	Autofix Rubocop Rails/RootPathnameMethods (#23760)	1 year ago
Nick Schonning	0cfdd1a401	Enable Rubocop Style/StringConcatenation defaults (#23792)	1 year ago
Jeremy Kescher	88d22463d9	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile # Gemfile.lock # config/sidekiq.yml	1 year ago
Jeremy Kescher	0e634397c3	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock	1 year ago
Nick Schonning	59c8d43d94	Autofix Rubocop Style/RescueStandardError (#23745)	1 year ago
Nick Schonning	af4c95100c	Autofix Rubocop Style/FormatString (#23743)	1 year ago
Nick Schonning	717683d1c3	Autofix Rubocop remaining Layout rules (#23679)	1 year ago
Nick Schonning	d2dcb6c45a	Autofix Rubocop Style/UnpackFirst (#23741)	1 year ago
Nick Schonning	bf785df9fe	Audofix Rubocop Style/WordArray (#23739)	1 year ago
Claire	7452a95998	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.	1 year ago
Nick Schonning	81ad6c2e39	Autofix Rubocop Style/StringLiterals (#23695)	1 year ago
Nick Schonning	2177daeae9	Autofix Rubocop Style/RedundantBegin (#23703)	1 year ago
Jeremy Kescher	4a6cc45f9d	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile # Gemfile.lock # config/sidekiq.yml	1 year ago
Nick Schonning	ab7816a414	Autofix Rubocop Style/Lambda (#23696)	1 year ago
Nick Schonning	e2a3ebb271	Autofix Rubocop Style/IfUnlessModifier (#23697)	1 year ago
Nick Schonning	a6f77aa28a	Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681)	1 year ago
Nick Schonning	e2567df860	Enable Lint/RedundantCopDisableDirective (#23687)	1 year ago
Nick Schonning	d65b2c1924	Apply Rubocop Style/RedundantConstantBase (#23463)	1 year ago
Nick Schonning	ac59d6f19f	Enable Rubocop Style/NumericLiterals (#23647)	1 year ago
Nick Schonning	669f6d2c0a	Run rubocop formatting except line length (#23632)	1 year ago
Jeremy Kescher	6ef68d4106	Update and fix dependencies	1 year ago
Jeremy Kescher	8de39432a9	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock # app/javascript/flavours/glitch/actions/interactions.js # config/initializers/rack_attack.rb # config/locales/en_GB.yml	1 year ago
Claire	ce84d163cc	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end, glitch-soc had extra entries at the end. Added upstream's new line before glitch-soc's. - `Gemfile.lock`: Upstream updated dependencies while glitch-soc has an extra one (hcaptcha). Updated dependencies like upstream did. - `app/controllers/api/v1/statuses_controller.rb`: Not a real conflict, upstream added a parameter (`allowed_mentions`) where glitch-soc already had an extra one (`content_type`). Added upstream's new parameter. - `app/javascript/styles/fonts/roboto-mono.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. - `app/javascript/styles/fonts/roboto.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes.	1 year ago
Nick Schonning	0c9d455ea5	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
Claire	87419f9307	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	70c0d754a6	Bump version to 4.1.0 (#23471) ... * Bump version to 4.1.0 * Editorialize changelog some more and highlight API changes * Update changelog	1 year ago
Claire	85558a5e18	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.	1 year ago
Nick Schonning	11557d1c5a	Apply Rubocop Rails/RootPublicPath (#23447)	1 year ago
Nick Schonning	f68bb52556	Apply Rubocop Style/NegatedIfElseCondition (#23451)	1 year ago
Nick Schonning	203739dd3a	Apply Rubocop Performance/StringIdentifierArgument (#23444)	1 year ago
Nick Schonning	c92e033cdd	Apply Rubocop Performance/BindCall (#23437)	1 year ago
Claire	aeacebb3d7	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.	1 year ago
Claire	79ca19e9b2	Bump version to 4.1.0rc3 (#23384)	1 year ago
Jeremy Kescher	27fdb81b65	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Jeremy Kescher	855b0d4dbb	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # lib/mastodon/version.rb	1 year ago
Claire	0f4637981b	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	2f112432e6	Bump version to 4.1.0rc2 (#23220)	1 year ago
Jeremy Kescher	44e4991a07	PgHero CVE fix ... Backport of 9b795a25cd	1 year ago
Jeremy Kescher	a48a289df7	v4.0.2+1.1.6	1 year ago
Jeremy Kescher	bd30ddd982	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Claire	3fd3e88b25	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	8180f7ba19	Bump version to 4.1.0rc1 (#23112)	1 year ago
Jeremy Kescher	bf5076e970	Update a few gems	1 year ago
Jeremy Kescher	0d829dadea	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/features/ui/index.js # app/javascript/mastodon/features/ui/index.js	1 year ago
JT Olio	a5fd2fe1cb	Add Storj DCS to cloud object storage options (#21929) ... * Add Storj DCS to cloud object storage options More explanation here: https://forum.storj.io/t/object-storage-provider-for-mastodon-instance/11464/37 * more help for which command to use	1 year ago
Claire	60abcb3c4c	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.	1 year ago
Claire	cb4e28f405	Add `tootctl domains purge` options to select subdomains and keep domain blocks (#22063) ... * Add --include-subdomains option to tootctl domains purge * Add support for '*.' subdomain wildcard patterns in `tootctl domains purge` * Fix custom emojis deletion not following subdomain and URI options * Change `tootctl domains purge` to not purge domain blocks unless --purge-domain-blocks is passed * Refactor `tootctl domains purge` * Add feedback on deleted domain blocks	1 year ago
Jeremy Kescher	004b2fc290	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Claire	ab59743c13	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.	1 year ago
Jeong Arm	0e8f8a1a1c	Implement tootctl accounts prune (#18397) ... * Implement tootctl accounts prune * Optimise query Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	745bdb11a0	Add `tootctl accounts migrate` (#22330) ... * Add tootctl accounts replay-migration Fixes #22281 * Change `tootctl accounts replay-migration` to `tootctl accounts migrate`	1 year ago
Claire	b52dc5f69d	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	a3a5aa1597	Fix incorrect env file generation in mastodon:setup (#23072) ... Regression from #23012	1 year ago
Claire	3e63fcd4f0	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.	1 year ago
Jeremy Kescher	18cbce92f8	v4.0.2+1.1.3	1 year ago
Claire	15b88a83ab	Fix sanitizer parsing link text as HTML when stripping unsupported links (#22558)	1 year ago
Claire	a65f86ae55	Fix `$` not being escaped in `.env.production` file generated by `mastodon:setup` (#23012) ... * Fix `$` not being escaped in `.env.production` file generated by `mastodon:setup` * Improve robustness of dotenv escaping	1 year ago
Jeremy Kescher	f862d584a7	redis_config.rb: Move away deprecated Sidekiq config syntax	1 year ago
Jeremy Kescher	0dfa8d73d7	v4.0.2+1.1.12	1 year ago
Jeremy Kescher	48373a71e3	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/components/status_action_bar.js # app/javascript/flavours/glitch/containers/status_container.js # app/javascript/flavours/glitch/features/status/components/action_bar.js # app/javascript/flavours/glitch/locales/de.json # app/javascript/flavours/glitch/locales/fr.json # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml	1 year ago
Claire	6c20dad201	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`	1 year ago
Nick Schonning	558ac411c4	Expand Stylelint glob to include CSS files (#22469)	1 year ago
Jeremy Kescher	eded36676f	Fix status reactions preventing an on_cascade delete	1 year ago
anna	b9afe72a3a	merge with catstodon/main v1.1.0	1 year ago
Jeremy Kescher	0406f173cf	Merge remote-tracking branch 'reactions/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/locales/de.js	1 year ago
Jeremy Kescher	a1a1d08890	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock	1 year ago
Claire	f3a4d57be1	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring	1 year ago
Dan Peterson	3d3429243f	Fix default S3_HOSTNAME used in mastodon:setup (#19932) ... s3-us-east-1.amazonaws.com does not exist. Co-authored-by: Effy Elden <effy@effy.space>	1 year ago
Claire	f239d31f23	Add --email and --dry-run options to `tootctl accounts delete` (#22328)	1 year ago
Evan	78ef635980	Add command to remove avatar and header images of inactive remote accounts from the local database (#22149) ... * Add tootctl subcommand media remove-profile-media * Trigger workflows * Correcting external linting * External linting error * External linting fix * Merging with remove command * Linting * Correct long option names Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Correct long option names Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Correct long option names Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Remove saving a list of purged accounts Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	47c75c29da	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	55b210b3e5	Fix crash and incorrect behavior in tootctl domains crawl (#19004)	1 year ago
anna	1abd4ba866	bump to nyastodon 1.1.9	1 year ago
anna	5b69f3db10	merge catcatnya/main into main	1 year ago
Jeremy Kescher	3e17e5b2cb	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
Claire	e877bb47b8	Merge branch 'main' into glitch-soc/main	1 year ago
anna	e0c55d6043	bump to nyastodon 1.1.8	1 year ago
anna	380567f453	merge catstodon/main into main	1 year ago
Jeremy Kescher	7e19321520	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
anna	ea10eabad6	merge catstodon/main into main	1 year ago
Claire	c52263f6f8	Fix deprecation warning in `tootctl accounts rotate` (#22120)	1 year ago
Claire	9a3d91f629	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.	1 year ago
Claire	66a70ebb6e	Fix pre-4.0 admin action logs (#22091) ... * Fix BackfillAdminActionLogs post-deployment migration * Improve migration tests * Backfill admin action logs again	1 year ago
Jeremy Kescher	8a24bef2e3	Fix Redis warnings regarding version 5.0.0	1 year ago
Jeremy Kescher	3520ebbd3b	v4.0.2+1.0.10	1 year ago
Jeremy Kescher	9554a005cd	v4.0.2+1.0.9	1 year ago
anna	fec439df28	bump to nyastodon 1.1.7	1 year ago
anna	c501a17b1f	merge catstodon/main into main	1 year ago
anna	fdc8dce395	bump to nyastodon 1.1.6	1 year ago
Jeremy Kescher	32600375b3	Merge remote-tracking branch 'upstream/main' into develop	1 year ago
anna	58145e775f	bump to nyastodon 1.1.5	1 year ago
anna	ca4df02956	merge catcatnya/main into main	1 year ago
Jeremy Kescher	bbbf5f1746	Upgrade ruby dependencies	1 year ago
anna	57e46f4aaf	merge catstodon/main into main	1 year ago
anna	4489c51bb9	bump to nyastodon 1.1.4	1 year ago
anna	ddeda89821	bump to nyastodon 1.1.3	1 year ago
anna	4e041d1e00	bump to nyastodon 1.1.2	1 year ago
anna	7f157c35cf	bump to nyastodon 1.1.1	1 year ago
Jeremy Kescher	730a09f642	v4.0.2+1.0.6	1 year ago
anna	0157438894	merge catcatnya/main into main	1 year ago
anna	1a84936322	bump to nyastodon 1.1.0	1 year ago
Claire	a2e7997592	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.	1 year ago
Claire	098ced7420	Remove support for Ruby 2.6 (#21477) ... As pointed out by https://github.com/mastodon/mastodon/pull/21297#discussion_r1028372193 at least one of our dependencies already dropped support for Ruby 2.6, and we had removed Ruby 2.6 tests from the CI over a year ago (#16861). So stop advertising Ruby 2.6 support, bump targeted version, and drop some compatibility code.	1 year ago
Claire	d587a268fd	Add logging for Rails cache timeouts (#21667) ... * Reduce redis cache store connect timeout from default 20 seconds to 5 seconds * Log cache store errors	1 year ago
Jeremy Kescher	0897c13799	v4.0.2+1.0.5	2 years ago