694 commits

Author	SHA1	Message	Date
Claire	077e0c6812	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.	2023-12-20 22:16:50 +01: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	469ee2ae36	Fix Style/HashEachMethods cop (#28173)	2023-12-01 16:07:19 +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	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	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	77caba3789	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-05 20:34:17 +02:00
Claire	cab4cbfa5c	Fix “Scoped order is ignored, it's forced to be batch order.” warnings (#26793)	2023-09-05 15:37:23 +02:00
Claire	e66f961e05	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-04 18:27:46 +02:00
Claire	cddef4c485	Fix language settings for users having selected the kmr language (#26787)	2023-09-04 17:56:31 +02:00
Claire	c107512fa6	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +02:00
Claire	ac2dae0d11	Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-releases.yml`: Upstream changed comments close to a line we modified to account for different container image repositories. Updated the comments as upstream did.	2023-09-02 13:50:16 +02:00
Claire	16681e0f20	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
Claire	1471be8225	Fix AddUniqueIndexOnPreviewCardsStatuses migration requiring PostgreSQL 12+ in some cases (#26737)	2023-08-31 15:47:30 +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	7e25e311d5	Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream	2023-08-21 21:07:39 +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	8c7f3c5332	Remove old non-unique index on preview_cards statuses join table (#26447)	2023-08-14 09:38:08 +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	ea8802a05a	Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream	2023-08-12 09:36:38 +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
Claire	4773d7b9aa	Fix preview_cards_statuses_pkey not being reindexed concurrently (#26384)	2023-08-08 11:41:53 +02:00
Christian Schmidt	8da99ffb0d	Add alt text for preview card thumbnails (#26184)	2023-08-03 15:41:51 +02:00
Claire	6b896b20cc	Add primary key to preview_cards_statuses join table (includes deduplication migration) (#25243)	2023-08-03 11:12:52 +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
Claire	b2515feb29	Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream	2023-07-30 14:33:28 +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
Christian Schmidt	3abe0fc5c8	Use valid email address for first account (#26114)	2023-07-23 15:58:19 +02:00
Claire	2d09653d50	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.	2023-07-13 13:35:15 +02:00
Matt Jankowski	ce43ed144c	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +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