1,106 commits

Author	SHA1	Message	Date
Claire	b8209c3b96	Merge commit '85662a5a57' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now.	2023-12-20 20:10:45 +01:00
Claire	d288a6162a	Merge commit '12c22ee5e7' into glitch-soc/merge-upstream	2023-12-19 20:40:05 +01:00
Claire	d6ad9d351e	Merge commit 'a36b59be8a' into glitch-soc/merge-upstream	2023-12-18 19:10:43 +01:00
Claire	46ddaffd40	Merge commit 'b87bfb8c96' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
Claire	cd2ee0ec5f	Merge commit '757d7c73c0' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept ours. - `yarn.lock`: Upstream changed from yarn 1 to yarn 4, but we had some different dependencies. Updated to yarn 4 and re-added our dependencies.	2023-12-18 18:25:33 +01:00
Claire	bc33be0342	Merge commit '23e32a4b30' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict because we had updated the `json-ld` gem to fix a yanked dependency. Kept our version of `json-ld` while updating other dependencies.	2023-12-18 18:07:24 +01:00
Claire	4113fbf6e8	Merge commit 'f476d9dab2' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules.	2023-12-17 23:04:16 +01:00
Claire	ddf3ad9541	Merge commit '3bf896c973' into glitch-soc/main ... Conflicts: - `package.json`: Upstream removed a dependency textually close to a glitch-only dependency. Updated as upstream while keeping our dependency.	2023-12-17 17:43:30 +01:00
Claire	9f92b05bd2	Merge commit '2e6bf60f15' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md`	2023-12-10 18:05:02 +01:00
Matt Jankowski	b696ca6b1a	Move self destruct CLI command definition code to module (#28131)	2023-11-30 10:48:46 +00:00
Matt Jankowski	a1636fce7f	Move lib/devise/* to lib/devise/strategies/* (#27638)	2023-11-29 10:10:21 +00:00
Matt Jankowski	31bef99b9e	Move lib/mastodon/premailer_webpack_strategy to lib/ (#27636)	2023-11-29 10:08:55 +00:00
Matt Jankowski	e892efbc40	Configure elastic search integration with rspec tag (#27882)	2023-11-17 11:52:20 +00:00
Eugen Rochko	0d14fcebae	Change link previews to keep original URL from the status (#27312)	2023-11-13 09:58:28 +00:00
Matt Jankowski	c9204b792c	Fix Rails/I18nLocaleTexts cop (#27779)	2023-11-09 09:46:39 +00:00
Renaud Chaput	757d7c73c0	Upgrade to Yarn 4, remove support for Node 16 (#27073)	2023-11-08 10:57:21 +00:00
Matt Jankowski	370802ce48	Add coverage for CLI::Maintenance#fix_duplicates command (#25252)	2023-11-07 15:21:58 +00:00
Matt Jankowski	45770c9306	Fix Performance/MapMethodChain cop (#27744)	2023-11-07 13:01:09 +00:00
Matt Jankowski	2d39268bc5	Fix Lint/OrAssignmentToConstant cop (#27750)	2023-11-07 09:11:50 +00:00
Matt Jankowski	7ef56d6e50	Move json_ld context loaders to config/initializers (#27590)	2023-10-31 15:21:23 +00:00
Matt Jankowski	4aa05d45fc	Capture minimum postgres version 12 (#27528)	2023-10-26 20:35:15 +00:00
Claire	62620956d5	Merge commit '9a3d047f3e' into glitch-soc/merge-upstream	2023-10-25 19:59:17 +02:00
Claire	fa65c8244f	Fix cache store pool config deprecation warnings (#27551)	2023-10-25 12:01:21 +00:00
Claire	4b0fb764c3	Merge commit 'e93a75f1a1' into glitch-soc/merge-upstream ... Conflicts and ported changes: - updated `@rails/ujs` imports	2023-10-24 19:59:19 +02:00
Claire	e25cc4deb7	Merge commit '379115e601' into glitch-soc/merge-upstream ... Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream changes.	2023-10-24 19:31:14 +02:00
Claire	e6c3d3c744	Merge commit 'd9503a1965' into glitch-soc/merge-upstream	2023-10-24 19:21:01 +02:00
Claire	57c0de949b	Merge commit '8b770ce811' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream changed how asset host CSP directives are used, and glitch-soc has a pretty different CSP file. It may be worth reconsidering the differences between upstream and glitch-soc but for now, just port the change.	2023-10-24 19:17:20 +02:00
Matt Jankowski	e93a75f1a1	Rails 7.1 update (#25963)	2023-10-23 17:58:29 +00:00
Claire	379115e601	Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)	2023-10-23 15:46:21 +00:00
Claire	79a63201a9	Fix Layout/EmptyLineAfterGuardClause issues caused by merging an old PR (#27512)	2023-10-23 16:21:48 +02:00
Claire	44edf3aa91	Improve error handling in mastodon:setup task (#21464)	2023-10-23 14:28:32 +02:00
Claire	63179f0bf4	Merge commit '5ef26d8fd5' into glitch-soc/merge-upstream	2023-10-17 21:59:58 +02:00
Matt Jankowski	65cd0700e4	Refactor domains cli to remove model call from regex (#25878)	2023-10-17 15:58:42 +02:00
Claire	ac2370778a	Merge commit 'c676bc91e9' into glitch-soc/merge-upstream ... Conflicts: - `config/environments/production.rb`: Upstream enforced a code style change and glitch-soc had a few different lines. Applied upstream's code style to glitch-soc's changes.	2023-10-08 17:21:12 +02:00
Claire	d7fcd70023	Merge commit '2016c5d912' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/cors.rb`: Upstream refactored this file, and glitch-soc had local changes. I could not find the rationale for the glitch-soc changes, so I used upstream's version.	2023-10-08 16:41:56 +02:00
Claire	19ebf7797e	Merge commit 'e6b903b21e' into glitch-soc/merge-upstream	2023-10-08 16:30:00 +02:00
Nick Schonning	8bb4706e11	Move migration_helpers Rubocop ignore to config (#24236)	2023-10-03 14:58:40 +02:00
Matt Jankowski	937dc42f10	Extract methods for file movement in CLI::Upgrade (#25120)	2023-09-28 16:04:05 +02:00
Claire	f0c720cfc9	Bump version to v4.3.0-alpha.0 (#27022)	2023-09-28 13:40:43 +02:00
Claire	abdb58840a	Merge commit '57f592fed5' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +02:00
Claire	82eaa26d87	Update tootctl maintenance fix-duplicates to Mastodon v4.2.0 (#27147)	2023-09-26 11:11:52 +02:00
Claire	06444c86c7	Fix division by zero in video in bitrate computation code (#27129)	2023-09-25 17:07:52 +02:00
Claire	86ec1e833e	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-21 16:56:09 +02:00
Claire	4fcc026f0f	Bump version to v4.2.0 (#27017)	2023-09-21 16:51:32 +02:00
Claire	f05985f8ec	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our version.	2023-09-21 15:12:00 +02:00
Claire	890e334703	Add migration tests for negative settings (#27012)	2023-09-21 12:33:30 +02:00
Claire	6a9e93ae19	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-19 17:32:48 +02:00
Claire	abcc0b38fa	Fix incorrect PostgreSQL version check (#26979)	2023-09-19 17:31:58 +02:00
Claire	f546b0c999	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-19 17:07:29 +02:00
Claire	f4b780ba22	Bump version to v4.2.0-rc2 (#26974)	2023-09-19 17:04:23 +02:00