915 commits

Author	SHA1	Message	Date
fef	c501a17b1f	merge catstodon/main into main	2022-12-02 01:41:43 +00:00
fef	fdc8dce395	bump to nyastodon 1.1.6	2022-12-02 01:07:17 +00:00
Jeremy Kescher	32600375b3	Merge remote-tracking branch 'upstream/main' into develop	2022-12-01 20:57:06 +01:00
fef	58145e775f	bump to nyastodon 1.1.5	2022-12-01 02:58:57 +00:00
fef	ca4df02956	merge catcatnya/main into main	2022-12-01 02:53:26 +00:00
Jeremy Kescher	bbbf5f1746	Upgrade ruby dependencies	2022-11-30 18:06:14 +01:00
fef	57e46f4aaf	merge catstodon/main into main	2022-11-30 16:35:05 +00:00
fef	4489c51bb9	bump to nyastodon 1.1.4	2022-11-30 16:30:42 +00:00
fef	ddeda89821	bump to nyastodon 1.1.3	2022-11-29 05:38:15 +00:00
fef	4e041d1e00	bump to nyastodon 1.1.2	2022-11-29 04:38:41 +00:00
fef	7f157c35cf	bump to nyastodon 1.1.1	2022-11-29 03:32:54 +00:00
Jeremy Kescher	730a09f642	v4.0.2+1.0.6	2022-11-29 00:15:08 +01:00
fef	0157438894	merge catcatnya/main into main	2022-11-28 22:47:46 +00:00
fef	1a84936322	bump to nyastodon 1.1.0	2022-11-28 22:47:32 +00: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
fef	1bfdff6795	bump to nyastodon 1.1.0-beta2	2022-11-25 23:12:19 +00:00
fef	7b4f3d2647	bump to nyastodon 1.1.0beta1	2022-11-24 17:34:45 +00:00
fef	8380f9fc2c	merge catstodon/main into main	2022-11-24 05:55:08 +00:00
Jeremy Kescher	41ce71cc92	Merge remote-tracking branch 'upstream/main' into develop	2022-11-23 22:54:06 +01:00
fef	1b7839f00a	merge catcatnya/main into main	2022-11-20 22:49:50 +00:00
fef	1792b688ac	bump to nyastodon 1.0.3	2022-11-20 22:46:00 +00:00
Jeremy Kescher	1381fb355c	v4.0.2+1.0.2	2022-11-19 10:22:49 +01:00
fef	9d14085607	bump to nyastodon 1.0.2	2022-11-19 05:43:03 +00:00
fef	44689beb43	merge catcatnya/main into main	2022-11-18 18:14:19 +00:00
Jeremy Kescher	874d4a2585	v4.0.2+1.0.1	2022-11-17 23:40:56 +01:00
fef	7c7f2d1b91	merge catcatnya/main into main	2022-11-16 18:47:18 +00: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
fef	baab85fac7	add post suffix version	2022-11-16 01:27:48 +00: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
Eugen Rochko	b31afc6294	Fix error when passing unknown filter param in REST API (#20626) ... Fix #19156	2022-11-14 08:06:06 +01:00
Claire	bd806a3090	Update fix-duplicates (#20502) ... Fixes #19133	2022-11-13 21:01:38 +01:00