918 commits

Author	SHA1	Message	Date
Jeremy Kescher	f862d584a7	redis_config.rb: Move away deprecated Sidekiq config syntax	2023-01-06 00:17:36 +01:00
Jeremy Kescher	0dfa8d73d7	v4.0.2+1.1.12	2023-01-05 23:30:18 +01:00
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	2023-01-05 23:29:53 +01:00
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`	2023-01-05 14:16:25 +01:00
Nick Schonning	558ac411c4	Expand Stylelint glob to include CSS files (#22469)	2023-01-05 13:42:13 +01:00
Jeremy Kescher	eded36676f	Fix status reactions preventing an on_cascade delete	2022-12-18 04:20:05 +01:00
Jeremy Kescher	0406f173cf	Merge remote-tracking branch 'reactions/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/locales/de.js	2022-12-17 11:09:32 +01:00
Jeremy Kescher	a1a1d08890	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock	2022-12-16 17:53:33 +01:00
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	2022-12-15 20:25:25 +01:00
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>	2022-12-15 16:38:51 +01:00
Claire	f239d31f23	Add --email and --dry-run options to tootctl accounts delete (#22328)	2022-12-15 14:52:50 +01:00
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>	2022-12-14 19:50:07 +01:00
Claire	47c75c29da	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-14 09:10:49 +01:00
Claire	55b210b3e5	Fix crash and incorrect behavior in tootctl domains crawl (#19004)	2022-12-13 20:02:32 +01:00
Jeremy Kescher	3e17e5b2cb	Merge remote-tracking branch 'upstream/main' into develop	2022-12-09 23:46:41 +01:00
Claire	e877bb47b8	Merge branch 'main' into glitch-soc/main	2022-12-09 16:48:55 +01:00
Jeremy Kescher	7e19321520	Merge remote-tracking branch 'upstream/main' into develop	2022-12-07 17:49:14 +01:00
Claire	c52263f6f8	Fix deprecation warning in tootctl accounts rotate (#22120)	2022-12-07 14:13:10 +01:00
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.	2022-12-07 09:03:42 +01:00
Claire	66a70ebb6e	Fix pre-4.0 admin action logs (#22091) ... * Fix BackfillAdminActionLogs post-deployment migration * Improve migration tests * Backfill admin action logs again	2022-12-06 23:38:03 +01:00
Jeremy Kescher	8a24bef2e3	Fix Redis warnings regarding version 5.0.0	2022-12-04 22:35:48 +01:00
Jeremy Kescher	3520ebbd3b	v4.0.2+1.0.10	2022-12-04 21:52:49 +01:00
Jeremy Kescher	9554a005cd	v4.0.2+1.0.9	2022-12-04 20:58:04 +01:00
Jeremy Kescher	32600375b3	Merge remote-tracking branch 'upstream/main' into develop	2022-12-01 20:57:06 +01:00
Jeremy Kescher	bbbf5f1746	Upgrade ruby dependencies	2022-11-30 18:06:14 +01:00
Jeremy Kescher	730a09f642	v4.0.2+1.0.6	2022-11-29 00:15:08 +01:00
Claire	a2e7997592	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.	2022-11-28 11:33:34 +01:00
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.	2022-11-27 20:41:39 +01:00
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	2022-11-27 20:37:37 +01:00
Jeremy Kescher	0897c13799	v4.0.2+1.0.5	2022-11-26 14:42:36 +01:00
Jeremy Kescher	f34d3b838e	Merge remote-tracking branch 'upstream/main' into develop	2022-11-26 14:02:07 +01:00
Jeremy Kescher	41ce71cc92	Merge remote-tracking branch 'upstream/main' into develop	2022-11-23 22:54:06 +01:00
Jeremy Kescher	1381fb355c	v4.0.2+1.0.2	2022-11-19 10:22:49 +01:00
Jeremy Kescher	874d4a2585	v4.0.2+1.0.1	2022-11-17 23:40:56 +01:00
Jeremy Kescher	82e063ac6c	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml	2022-11-16 17:43:21 +01:00
Claire	1901829f9a	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Our config file is pretty different from upstream. Upstream changed CSP directive `script-src` to include `wasm-unsafe-eval` instead of `unsafe-eval`, which we did not include. Added `wasm-unsafe-eval` to `script-src` to fix execution of the OCR web worker. - `package.json`: Upstream updated a dependency (`array-includes`) textually adjacent to a glitch-soc-only dependency (`atrament`). Updated `array-includes` as upstream did.	2022-11-16 08:30:00 +01:00
Jeremy Kescher	6d5a8d89d1	4.0.1+1.0.4	2022-11-15 08:04:40 +01:00
Eugen Rochko	03b0f3ac83	Bump version to 4.0.2 (#20725)	2022-11-15 03:57:18 +01:00
Jeremy Kescher	4b56353f13	Merge remote-tracking branch 'upstream/main' into develop	2022-11-15 00:34:05 +01:00
Jeremy Kescher	0005e01aa6	4.0.1+1.0.2	2022-11-14 22:52:11 +01:00
Jeremy Kescher	14ef153c69	Revert "[Glitch] Fix nodes order being sometimes mangled when rewriting emoji" ... This reverts commit 06faf2f977.	2022-11-14 22:50:45 +01:00
Jeremy Kescher	06faf2f977	[Glitch] Fix nodes order being sometimes mangled when rewriting emoji ... backport ccbca50a25 by Claire	2022-11-14 22:40:37 +01:00
Jeremy Kescher	ec15e58efa	4.0.1+1.0.0	2022-11-14 22:34:38 +01:00
Claire	b5698af25f	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 22:30:30 +01:00
Eugen Rochko	4415dd6036	Bump version to 4.0.1 (#20696)	2022-11-14 22:21:14 +01:00
Jeremy Kescher	122870cb6b	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # config/initializers/rack_attack.rb # lib/mastodon/version.rb	2022-11-14 22:18:48 +01:00
Eugen Rochko	fb389bd73c	Bump version to 4.0.0 (#20636)	2022-11-14 20:27:12 +01:00
Claire	cd713cac81	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:57:25 +01:00
Eugen Rochko	75299a042c	Bump version to 4.0.0rc4 (#20634)	2022-11-14 08:50:14 +01:00
Claire	32c70d2f09	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.	2022-11-14 08:35:55 +01:00