676 commits

Author	SHA1	Message	Date
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
Claire	12fa24a885	Fix forgotten unconfirmed_email migration file (#25702)	2023-07-04 11:25:29 +02:00
Claire	e6a8faae81	Add users index on unconfirmed_email (#25672)	2023-07-02 19:41:35 +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
Eugen Rochko	ba06a2f104	Revert "Rails 7 update" (#25667)	2023-07-02 11:14:22 +02:00
Matt Jankowski	50c2a03695	Rails 7 update (#24241)	2023-07-02 10:38:53 +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
Claire	f378f10404	Fix compatibility of recent migration with PostgreSQL 10 (#25324)	2023-06-07 01:53:50 +02:00
Eugen Rochko	4eda233e09	Add webhook templating (#23289) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-06-06 10:42:47 +02:00
Darius Kazemi	bacb674921	Add exclusive lists (#22048) ... Co-authored-by: Liam Cooke <liam@liamcooke.com> Co-authored-by: John Holdun <john@johnholdun.com> Co-authored-by: Effy Elden <effy@effy.space> Co-authored-by: Lina Reyne <git@lina.pizza> Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-06-05 09:37:02 +02:00
Claire	fe84f7e323	Add missing primary keys to accounts_tags and statuses_tags (#25210)	2023-06-01 09:49:06 +02:00
Claire	0669783da8	Merge branch 'main' into glitch-soc/merge-upstream	2023-05-28 17:01:25 +02:00
Claire	e2ab9d4dad	Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00