334 Commits (main)

Author	SHA1	Message	Date
Claire	f35ba6963d	Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream	1 week ago
Matt Jankowski	0d397db5dd	Consolidate system specs into single directory, use rspec tags for configuration (#30206)	1 week ago
Claire	f7dadc9f0b	Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream	2 weeks ago
Claire	996292cd55	Fix `db:encryption:init` requiring ActiveRecord encryption variables to be set (#30202)	2 weeks ago
Claire	3789d9f825	Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' 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.	2 weeks ago
Claire	33368e3e79	Change ActiveRecordEncryption variable to be more explicit (#30151)	2 weeks ago
Matt Jankowski	1e7d5d2957	Update `devise-two-factor` to version 5.0.0 (#28325) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 weeks ago
Claire	eeefb7cdbc	Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream	3 weeks ago
Claire	6204d13a2e	Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.	3 weeks ago
Claire	c3e12a4dfa	Change how theme style packs are loaded ... Load the `common` style pack, and then charge the style pack for the current skin, independent from any selected JS pack.	3 weeks ago
Matt Jankowski	2ec9bff36e	Fix Rubocop `Rails/UniqueValidationWithoutIndex` cop (#27461) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	4 weeks ago
Matt Jankowski	828299e71c	Enable AR Encryption (#29831)	1 month ago
Claire	903dc53522	Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream	1 month ago
Claire	70a8fcf07d	Fix notification policy migration not preserving `filter_private_mentions` correctly (#29699)	2 months ago
Claire	2dc244784c	Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream	3 months ago
Claire	ef3d15554b	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.	3 months ago
Claire	cfa71a4d16	Fix admin account created by `mastodon:setup` not being auto-approved (#29379)	3 months ago
Matt Jankowski	245064bb98	Move "everyone" role and "instance actor" account magic number IDs to constants (#29260)	3 months ago
Claire	3c3ef8b9d3	Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default (#29199)	3 months ago
Claire	554e2a019e	Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default (#29199)	3 months ago
Claire	5fa2821853	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	4 months ago
Matt Jankowski	ca7053f19c	Consolidate db test prep steps to rake task (#28886)	4 months ago
Claire	22cfab0ebf	Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream ... Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.	4 months ago
Matt Jankowski	defe5f4076	Fix `Rails/WhereExists` cop in lib/tasks (#28852)	4 months ago
Claire	102eff7c05	Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream	4 months ago
Matt Jankowski	6a5d70e146	Update pre_migration_check postgres version requirement (#28800)	4 months ago
Claire	c59fb65ddc	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.	4 months ago
Matt Jankowski	127503eb2c	Fix `Rails/RakeEnvironment` cop (#28782)	4 months ago
Claire	e4d07c7bcc	Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream	4 months ago
Renaud Chaput	01b6c83c36	Add a new `@/` alias for the root frontend directory and use it where possible (#28753)	4 months ago
Claire	4fcb372776	Fix Ruby linting issue	4 months ago
Claire	2f521bc84a	Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream	4 months ago
Claire	1323dfac80	Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream	4 months ago
Claire	a3b6a85521	Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.	4 months ago
Claire	6bbcd9348e	Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064)	4 months ago
Matt Jankowski	df9e220364	Add JS console errors check (#28682)	4 months ago
Essem	b6e353537b	Add new emojis from `jdecked/twemoji` 15.0 (#28404)	4 months ago
Claire	630b245bb4	Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused.	4 months ago
gunchleoc	173953c23e	Fix ISO code for Canadian French (#26015) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	4 months ago
Claire	d288a6162a	Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream	5 months ago
Claire	d6ad9d351e	Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream	5 months ago
Claire	46ddaffd40	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	5 months ago
Claire	cd2ee0ec5f	Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' 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.	5 months ago
Matt Jankowski	e892efbc40	Configure elastic search integration with rspec tag (#27882)	6 months ago
Eugen Rochko	0d14fcebae	Change link previews to keep original URL from the status (#27312)	6 months ago
Matt Jankowski	c9204b792c	Fix `Rails/I18nLocaleTexts` cop (#27779)	6 months ago
Renaud Chaput	757d7c73c0	Upgrade to Yarn 4, remove support for Node 16 (#27073)	6 months ago
Claire	e6c3d3c744	Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream	7 months ago
Claire	57c0de949b	Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' 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.	7 months ago
Claire	79a63201a9	Fix Layout/EmptyLineAfterGuardClause issues caused by merging an old PR (#27512)	7 months ago