294 commits

Author	SHA1	Message	Date
Essem	845f95bc5d	Merge remote-tracking branch 'upstream/main'	2024-08-03 18:36:56 -05:00
Claire	1f796d129d	Merge commit '598ae4f2da' into glitch-soc/merge-upstream ... Conflicts: - `config/routes/api.rb`: Upstream added an endpoint, textually close to a glitch-soc-only endpoint. Ported upstream changes.	2024-07-30 20:47:34 +02:00
Matt Jankowski	7e33583daa	Dont run crowdin upload workflow on forks (#31195)	2024-07-29 17:19:05 +00:00
Essem	4aa2f92bef	Merge remote-tracking branch 'upstream/main'	2024-07-10 09:41:37 -05:00
Claire	6a55232988	Merge commit 'fa8e972722' into glitch-soc/merge-upstream	2024-07-08 19:41:14 +02:00
Matt Jankowski	f1300ad284	Rename jobs/attachments rspec tag names (#29762)	2024-07-08 16:01:08 +00:00
Matt Jankowski	79b0e192d9	Move test migrations paths check to workflow level (#30702)	2024-07-08 08:16:00 +00:00
Matt Jankowski	1d35626dc7	Limit CI push triggers to main and stable-* branches (#30934)	2024-07-07 09:39:31 +00:00
Essem	8a01720cb2	Merge remote-tracking branch 'upstream/main'	2024-06-30 15:41:10 -05:00
Claire	d2aea85e6c	Merge commit '5d4dbbcc67' into glitch-soc/merge-upstream	2024-06-30 11:25:40 +02:00
Matt Jankowski	f6390c3326	Use flatware to parallelize CI specs (#30284)	2024-06-27 07:42:57 +00:00
Essem	167a30b2bf	Merge remote-tracking branch 'upstream/main'	2024-06-19 21:43:32 -05:00
Claire	52e34a6bd6	Merge commit '5f4d231e98' into glitch-soc/merge-upstream	2024-06-19 11:59:06 +02:00
Claire	8098d27f84	Stop calling Webpacker in full-stack tests (#30763)	2024-06-19 09:31:30 +00:00
Claire	395b9011ee	Merge commit 'd5f02adad7' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change.	2024-06-17 18:30:28 +02:00
Claire	8089fa6935	Merge commit 'a7264a2b42' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Conflict because of glitch-soc's different theming system. Ported upstream's change.	2024-06-17 18:14:14 +02:00
Claire	677f73f793	Merge commit '3a191b3797' into glitch-soc/merge-upstream	2024-06-17 13:41:58 +02:00
Matt Jankowski	2b10b0e027	Reduce docker service container health check wait times (#30703)	2024-06-14 15:49:08 +00:00
Matt Jankowski	a66f6e1005	Add binstub for brakeman (#30493)	2024-06-13 15:07:02 +00:00
Matt Jankowski	271a8e99e2	Update merge conflict rebase action version (silences node version warning) (#30690)	2024-06-13 14:37:49 +00:00
Matt Jankowski	3a191b3797	Add rubocop binstub, simplify configuration (#30407)	2024-06-13 14:27:17 +00:00
Matt Jankowski	8889816a51	Use stock ruby environment on CI lint tasks (#30657)	2024-06-13 13:23:32 +00:00
Matt Jankowski	3b7c50abca	Remove bundler-audit ignore config (#30672)	2024-06-13 13:15:32 +00:00
Essem	82e12570a7	Merge remote-tracking branch 'upstream/main'	2024-06-12 19:48:26 -05:00
Matt Jankowski	47f97e113a	Update the bundler-audit vulnerability DB when running (#30658)	2024-06-12 11:39:16 +00:00
Matt Jankowski	9321a454de	Combine CI migration tests (#30661)	2024-06-12 11:38:20 +00:00
Matt Jankowski	cec8e34b25	Remove unused CI env vars (#30660)	2024-06-11 20:29:00 +00:00
Claire	4daed855e5	Merge commit 'd818ddd687' into glitch-soc/merge-upstream	2024-06-11 19:46:11 +02:00
Essem	9dcd9ba5b2	Merge remote-tracking branch 'upstream/main'	2024-06-10 16:59:22 -05:00
Matt Jankowski	0e1110c947	Use SECRET_KEY_BASE_DUMMY feature as placeholder during asset compilation (#30505)	2024-06-10 20:08:04 +00:00
Claire	be68f8f4af	Merge commit '9cc4040308' into glitch-soc/merge-upstream	2024-06-10 18:20:08 +02:00
Claire	82fcb55680	Fix crowdin upload workflow not triggering on glitch-soc source string changes	2024-06-08 13:49:02 +02:00
Matt Jankowski	c1a84f1b5b	Case correction Github -> GitHub (#30446) ... Co-authored-by: Igor <igordsmelo@gmail.com>	2024-06-08 10:32:39 +00:00
Claire	30b00ca2b5	Merge commit '5652ca6135' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
Eugen Rochko	5f15a892fa	Add support for libvips in addition to ImageMagick (#30090) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-06-05 19:15:39 +00:00
Essem	9b0c46ebf2	Merge remote-tracking branch 'upstream/main'	2024-05-20 21:35:02 -05:00
Essem	4f37b4873f	Merge remote-tracking branch 'upstream/main'	2024-05-14 21:20:27 -05:00
Claire	666760f450	Merge commit '1bf661cddb' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream fixed a command we have modified in glitch-soc. Updated as upstream did.	2024-05-14 20:47:14 +02:00
Claire	b5b84fad65	Fix OpenSearch compatibility issue (#30278)	2024-05-14 17:54:28 +00:00
Claire	f35ba6963d	Merge commit '1959365c2f' into glitch-soc/merge-upstream	2024-05-11 22:10:56 +02:00
Matt Jankowski	0d397db5dd	Consolidate system specs into single directory, use rspec tags for configuration (#30206)	2024-05-10 12:36:09 +00:00
Renaud Chaput	5a3062f723	Pass the CodeCov token from the secret to the action (#30219)	2024-05-10 08:00:02 +00:00
Essem	b636ca2099	Merge remote-tracking branch 'upstream/main'	2024-05-06 22:12:42 -05:00
Claire	3789d9f825	Merge commit 'b7902225d6' into glitch-soc/merge-upstream ... Conflicts: - `spec/validators/status_length_validator_spec.rb`: Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS` while glitch-soc had custom code to read from `MAX_TOOT_CHARS`. Switched to using upstream's implementation of the tests.	2024-05-04 16:28:30 +02:00
Claire	a76980a229	Merge commit 'f0c9cbaf3b' into glitch-soc/merge-upstream	2024-05-04 15:40:07 +02:00
Claire	d6f9c97ae4	Merge commit '7201f99cf8' into glitch-soc/merge-upstream	2024-05-04 15:24:22 +02:00
Matt Jankowski	b7902225d6	Use built-in github annotation output for stylelint (#30165)	2024-05-03 14:56:48 +00:00
Essem	a7b905d573	Merge remote-tracking branch 'upstream/main'	2024-05-02 23:31:54 -05:00
Claire	eeefb7cdbc	Merge commit 'a15139bc02' into glitch-soc/merge-upstream	2024-05-01 19:42:34 +02:00
Claire	6204d13a2e	Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.	2024-05-01 19:38:34 +02:00