621 commits

Author	SHA1	Message	Date
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.	2024-01-11 12:59:27 +01:00
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`.	2024-01-10 17:51:12 +01:00
gunchleoc	173953c23e	Fix ISO code for Canadian French (#26015) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-09 10:56:13 +00:00
Matt Jankowski	ae39bed95b	Solve remaining db/*migrate* cops (#28579)	2024-01-04 16:40:28 +00:00
Claire	dfdadb92e8	Add ability to require approval when users sign up using specific email domains (#28468)	2024-01-04 09:07:05 +00:00
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
Claire	f2eb5038a6	Fix linting warning in glitch-soc-only migration	2023-12-21 19:25:12 +01:00
Claire	f5b7307890	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines.	2023-12-21 19:24:10 +01:00
Eugen Rochko	b5ac61b2c5	Change algorithm of follow recommendations (#28314) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-12-19 10:59:43 +00:00
Claire	d6ad9d351e	Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream	2023-12-18 19:10:43 +01:00
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.	2023-12-17 23:04:16 +01:00
Matt Jankowski	3e336fe706	Opt out of Rails/SkipsModelValidations cop in db/migrate (#28371)	2023-12-15 14:38:12 +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	c501d626e8	Fix Rails/BulkChangeTable cop (#26890)	2023-11-06 16:15:48 +00:00
Claire	74fd46d3ab	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	2023-10-19 19:14:04 +02:00
Matt Jankowski	bcd0171e5e	Fix Lint/UselessAssignment cop (#27472)	2023-10-19 16:55:06 +02:00
Matt Jankowski	a1b27d8b61	Fix Naming/VariableNumber cop (#27447)	2023-10-18 14:26:22 +02:00
Claire	b57ec6ad6b	Fix some settings not being properly migrated when set to false	2023-09-21 15:17:44 +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	08b495d95c	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +02:00
Claire	81caafbe84	Fix performances of profile directory (#26842)	2023-09-07 18:55:25 +02:00
Claire	c107512fa6	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +02:00
Claire	16681e0f20	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
Claire	1b5d3fdc5e	Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream	2023-08-24 20:55:28 +02:00
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.	2023-08-22 18:31:28 +02:00
Claire	ee702e36e5	Change follow recommendation materialized view to be faster in most cases (#26545) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2023-08-18 18:20:55 +02:00
Claire	90ec88d58b	Add support for indexable attribute on remote actors (#26485) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2023-08-14 18:54:51 +02:00
Claire	6530f9709c	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	2023-08-13 18:47:15 +02:00
Claire	44a5f1b64a	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README	2023-08-11 22:15:41 +02:00
Matt Jankowski	271d384fd0	Use migration classes in migrations where current definition conflicts with older (#26390)	2023-08-09 11:26:42 +02:00
Christian Schmidt	8da99ffb0d	Add alt text for preview card thumbnails (#26184)	2023-08-03 15:41:51 +02:00
Claire	425d77f812	Fix crash in tootctl status remove and some old migrations (#26210)	2023-08-02 20:54:56 +02:00
Claire	454d8567d4	Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream	2023-07-30 15:54:34 +02:00
Claire	bd349cb850	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.	2023-07-30 14:58:56 +02:00
Matt Jankowski	a2dca50ef3	Use heredoc SQL blocks in AddFromAccountIdToNotifications migration (#26178)	2023-07-26 09:49:15 +02:00
Eugen Rochko	7bd8ef355c	Add published_at attribute to preview cards (#26153)	2023-07-25 13:40:35 +02:00
Claire	9ae60f8738	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.	2023-07-12 16:03:05 +02:00
Matt Jankowski	b8b2470cf8	Fix Style/SlicingWithRange cop (#25923)	2023-07-12 10:03:06 +02:00
Nick Schonning	1d557305d2	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
Claire	5de49e74d4	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-05 12:01:26 +02:00
Claire	12fa24a885	Fix forgotten unconfirmed_email migration file (#25702)	2023-07-04 11:25:29 +02:00
Claire	933ba1a3eb	Add superapp index on oauth_applications (#25670)	2023-07-02 16:56:16 +02:00
Claire	44e98a2740	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-02 11:49:08 +02:00
Matt Jankowski	c47cdf6e17	Add index to backups on user_id column (#25647)	2023-06-30 19:09:03 +02:00
Claire	42a0898f16	Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.	2023-06-10 18:42:29 +02:00
Claire	c48ec9cb8c	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.	2023-06-10 16:48:01 +02:00
Claire	d8b0a732aa	Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components.	2023-06-10 16:22:14 +02:00
Claire	aa57f7e3e2	Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream	2023-06-10 15:17:08 +02:00
Eugen Rochko	4c9406bdb0	Add time zone preference (#25342)	2023-06-10 03:29:37 +02:00