1226 Commits (f27bc326d4f1e2b4ebab7370226f1316f4308508)

Author	SHA1	Message	Date
Skye	fa3b5195fd	Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream	9 months ago
Kouhai	e9dbe31776	th: Merge remote-tracking branch 'glitch/main'	9 months ago
Kouhai	27f74617cc	th: Merge remote-tracking branch 'glitch/main' (915cd36ac1)	9 months ago
Claire	70de52c297	Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream	10 months ago
Eugen Rochko	5b1eb09d54	Add annual reports for accounts (#28693)	10 months ago
Claire	528a8fa495	Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream	10 months ago
Matt Jankowski	f0b93ab02f	Use AR `database_version` in PG version checks in migrations (#28804)	10 months ago
Essem	d156472304	Fix rubocop complaint	10 months ago
Essem	3da6e4d57f	More cleanup	10 months ago
Essem	f578317f53	Add support for emoji reactions ... Squashed, modified, and rebased from glitch-soc/mastodon#2221. Co-authored-by: fef <owo@fef.moe> Co-authored-by: Jeremy Kescher <jeremy@kescher.at> Co-authored-by: neatchee <neatchee@gmail.com> Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com> Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>	10 months ago
Claire	08304075be	Fix old glitch-soc migration using removed `add_column_with_default` helper	10 months ago
Claire	23d8bd8ce1	Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream	10 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.	10 months ago
Claire	0b2c7cdb02	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.	10 months ago
Matt Jankowski	ea1c0feb86	Remove `add_column_with_default` migration helper (#28654)	10 months ago
gunchleoc	173953c23e	Fix ISO code for Canadian French (#26015) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	10 months ago
Matt Jankowski	ae39bed95b	Solve remaining `db/*migrate*` cops (#28579)	10 months ago
Claire	dfdadb92e8	Add ability to require approval when users sign up using specific email domains (#28468)	10 months ago
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	11 months ago
Claire	f2eb5038a6	Fix linting warning in glitch-soc-only migration	11 months ago
Claire	f5b7307890	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines.	11 months ago
Eugen Rochko	b5ac61b2c5	Change algorithm of follow recommendations (#28314) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	11 months ago
Claire	d6ad9d351e	Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream	11 months ago
Claire	4113fbf6e8	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' 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.	11 months ago
Matt Jankowski	3e336fe706	Opt out of `Rails/SkipsModelValidations` cop in db/migrate (#28371)	11 months ago
Eugen Rochko	0d14fcebae	Change link previews to keep original URL from the status (#27312)	1 year ago
Matt Jankowski	c501d626e8	Fix `Rails/BulkChangeTable` cop (#26890)	1 year ago
kouhai	b24d7bb6f2	th: Merge remote-tracking branch 'glitch/main' (18eacc7a07)	1 year ago
Claire	74fd46d3ab	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	1 year ago
Matt Jankowski	bcd0171e5e	Fix `Lint/UselessAssignment` cop (#27472)	1 year ago
Matt Jankowski	a1b27d8b61	Fix `Naming/VariableNumber` cop (#27447)	1 year ago
Claire	b57ec6ad6b	Fix some settings not being properly migrated when set to `false`	1 year ago
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.	1 year ago
Claire	890e334703	Add migration tests for negative settings (#27012)	1 year ago
Kouhai	9d32bdbcde	th: Merge remote-tracking branch 'glitch/main'	1 year ago
Claire	08b495d95c	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	1 year ago
Claire	296e8f791e	Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream	1 year ago
Claire	81caafbe84	Fix performances of profile directory (#26842)	1 year ago
Claire	d45dd56874	Fix performances of profile directory (#26842)	1 year ago
Claire	c107512fa6	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	1 year ago
Claire	78a851ae0a	Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream	1 year ago
Claire	16681e0f20	Add admin notifications for new Mastodon versions (#26582)	1 year ago
Claire	97238e3496	Add admin notifications for new Mastodon versions (#26582)	1 year ago
Kouhai	7c7355a964	th: Merge remote-tracking branch 'glitch/main' (d033fab0ed)	1 year ago
Claire	1b5d3fdc5e	Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream	1 year ago
Claire	6fba17f6f3	Merge commit 'b4a95b46cd4399420670c8edf1807ad3a6e979ec' into glitch-soc/merge-upstream	1 year ago
Claire	2126812f65	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.	1 year ago
Claire	b6ca020d02	Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.	1 year ago
Claire	ee702e36e5	Change follow recommendation materialized view to be faster in most cases (#26545) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
Claire	b4a95b46cd	Change follow recommendation materialized view to be faster in most cases (#26545) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago