684 commits

Author	SHA1	Message	Date
Jeremy Kescher	a79405d877	v4.1.0+2.0.1	2023-03-05 12:37:14 +01:00
Jeremy Kescher	7318b74ebf	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/models/notification.rb # config/locales/simple_form.de.yml	2023-03-05 12:34:16 +01:00
Jean byroot Boussier	922837dc96	Upgrade to latest redis-rb 4.x and fix deprecations (#23616) ... Co-authored-by: Jean Boussier <jean.boussier@gmail.com>	2023-03-04 16:38:28 +01:00
Claire	8784498ebf	Fix tootctl accounts migrate error due to typo (#23567)	2023-03-03 20:45:12 +01:00
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.	2023-02-25 14:00:40 +01:00
Nick Schonning	8fd3fc404d	Autofix Rubocop Rails/RootPathnameMethods (#23760)	2023-02-22 09:57:15 +09:00
Nick Schonning	0cfdd1a401	Enable Rubocop Style/StringConcatenation defaults (#23792)	2023-02-22 09:54:36 +09:00
Jeremy Kescher	88d22463d9	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile # Gemfile.lock # config/sidekiq.yml	2023-02-21 00:53:40 +01:00
Jeremy Kescher	0e634397c3	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock	2023-02-21 00:40:08 +01:00
Nick Schonning	59c8d43d94	Autofix Rubocop Style/RescueStandardError (#23745)	2023-02-20 11:01:20 +01:00
Nick Schonning	af4c95100c	Autofix Rubocop Style/FormatString (#23743)	2023-02-20 07:58:33 +01:00
Nick Schonning	717683d1c3	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
Nick Schonning	bf785df9fe	Audofix Rubocop Style/WordArray (#23739)	2023-02-20 06:14:10 +01:00
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.	2023-02-19 10:42:55 +01:00
Nick Schonning	81ad6c2e39	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
Nick Schonning	2177daeae9	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
Jeremy Kescher	4a6cc45f9d	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile # Gemfile.lock # config/sidekiq.yml	2023-02-18 22:38:53 +01:00
Nick Schonning	ab7816a414	Autofix Rubocop Style/Lambda (#23696)	2023-02-18 12:39:00 +01:00
Nick Schonning	e2a3ebb271	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
Nick Schonning	e2567df860	Enable Lint/RedundantCopDisableDirective (#23687)	2023-02-18 04:30:14 +01:00
Nick Schonning	ac59d6f19f	Enable Rubocop Style/NumericLiterals (#23647)	2023-02-18 11:05:57 +09:00
Jeremy Kescher	6ef68d4106	Update and fix dependencies	2023-02-17 00:29:06 +01:00
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	2023-02-17 00:26:21 +01:00
Claire	87419f9307	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-10 22:49:59 +01:00
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	2023-02-10 22:21:23 +01:00
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.	2023-02-09 12:46:12 +01:00
Nick Schonning	11557d1c5a	Apply Rubocop Rails/RootPublicPath (#23447)	2023-02-08 10:38:07 +01:00
Nick Schonning	203739dd3a	Apply Rubocop Performance/StringIdentifierArgument (#23444)	2023-02-08 02:36:20 +01:00
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.	2023-02-03 19:23:27 +01:00
Claire	79ca19e9b2	Bump version to 4.1.0rc3 (#23384)	2023-02-03 16:39:38 +01:00
Jeremy Kescher	27fdb81b65	Merge remote-tracking branch 'upstream/main' into develop	2023-01-27 00:36:49 +01:00
Jeremy Kescher	855b0d4dbb	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # lib/mastodon/version.rb	2023-01-26 17:27:01 +01:00
Claire	0f4637981b	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-25 17:26:38 +01:00
Claire	2f112432e6	Bump version to 4.1.0rc2 (#23220)	2023-01-25 16:20:54 +01:00
Jeremy Kescher	44e4991a07	PgHero CVE fix ... Backport of 9b795a25cd	2023-01-23 08:29:54 +01:00
Jeremy Kescher	a48a289df7	v4.0.2+1.1.6	2023-01-22 11:34:39 +01:00
Jeremy Kescher	bd30ddd982	Merge remote-tracking branch 'upstream/main' into develop	2023-01-22 11:33:25 +01:00
Claire	3fd3e88b25	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-21 14:58:15 +01:00
Claire	8180f7ba19	Bump version to 4.1.0rc1 (#23112)	2023-01-20 14:19:12 +01:00
Jeremy Kescher	bf5076e970	Update a few gems	2023-01-18 22:33:07 +01:00
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	2023-01-18 22:29:27 +01:00
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.	2023-01-18 17:38:11 +01:00
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	2023-01-18 16:50:50 +01:00
Jeremy Kescher	004b2fc290	Merge remote-tracking branch 'upstream/main' into develop	2023-01-15 20:38:42 +01:00
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.	2023-01-14 22:34:09 +01:00
Jeong Arm	0e8f8a1a1c	Implement tootctl accounts prune (#18397) ... * Implement tootctl accounts prune * Optimise query Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-01-13 22:34:16 +01:00
Claire	745bdb11a0	Add tootctl accounts migrate (#22330) ... * Add tootctl accounts replay-migration Fixes #22281 * Change `tootctl accounts replay-migration` to `tootctl accounts migrate`	2023-01-13 17:00:23 +01:00
Jeremy Kescher	18cbce92f8	v4.0.2+1.1.3	2023-01-11 23:52:03 +01:00
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	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
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
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	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
Claire	457c37e47a	Fix index name in fix-duplicates task (#20632)	2022-11-14 08:33:48 +01:00
Claire	bd806a3090	Update fix-duplicates (#20502) ... Fixes #19133	2022-11-13 21:01:38 +01:00
Jeremy Kescher	c40b063bd4	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # lib/mastodon/version.rb	2022-11-12 14:38:59 +01:00
Claire	93912f0498	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.	2022-11-12 13:28:03 +01:00
Eugen Rochko	53028af10e	Bump version to 4.0.0rc3 (#20378)	2022-11-11 08:39:38 +01:00
Jeremy Kescher	1eadfddbd2	Bump to v3.5.3+1.2.2	2022-11-10 21:11:44 +01:00
Jeremy Kescher	5ee53d06a2	Bump to v3.5.3+1.2.1	2022-11-08 07:30:27 +01:00
Jeremy Kescher	cf746c6ded	Bump to v3.5.3+1.2.0	2022-11-06 21:03:14 +01:00
Jeremy Kescher	996267fc8b	Fix vanilla flavor being broken due to incorrect imports	2022-11-06 13:03:02 +01:00