ef01aa71a9
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
49c9861551
Fix language settings for users having selected the `kmr` language ( #26787 )
1 year ago
78a851ae0a
Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream
1 year ago
432bd89f72
Merge commit '20913b52bb192a9525b3da53a1d25c816a4a177d' 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.
1 year ago
97238e3496
Add admin notifications for new Mastodon versions ( #26582 )
1 year ago
3f1b38932b
Fix `AddUniqueIndexOnPreviewCardsStatuses` migration requiring PostgreSQL 12+ in some cases ( #26737 )
1 year ago
6fba17f6f3
Merge commit 'b4a95b46cd4399420670c8edf1807ad3a6e979ec' into glitch-soc/merge-upstream
1 year ago
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
ccf5f88e43
Merge commit '89b675cb07886dcc72ef52b6f778679d7099d96c' into glitch-soc/merge-upstream
1 year ago
b4a95b46cd
Change follow recommendation materialized view to be faster in most cases ( #26545 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
1 year ago
3c50a91087
Add support for `indexable` attribute on remote actors ( #26485 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
e204d2090f
Remove old non-unique index on preview_cards statuses join table ( #26447 )
1 year ago
33024cca51
Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
1 year ago
6d6acefcc1
Merge commit '788d7a6a2a4582601dd741ad880ef7b775335d14' into glitch-soc/merge-upstream
1 year ago
32faa7213f
Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' 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
1 year ago
5ebcd23979
Use migration classes in migrations where current definition conflicts with older ( #26390 )
1 year ago
64e9f2e65a
Fix `preview_cards_statuses_pkey` not being reindexed concurrently ( #26384 )
1 year ago
ecb00fa5ac
Add alt text for preview card thumbnails ( #26184 )
1 year ago
5ec0d5faa9
Add primary key to preview_cards_statuses join table (includes deduplication migration) ( #25243 )
1 year ago
1c5c1960b9
Fix crash in `tootctl status remove` and some old migrations ( #26210 )
1 year ago
68d080177a
Merge commit 'eb1139fd42203ad966810f7f7ed6b55949ac7e8a' into glitch-soc/merge-upstream
1 year ago
f55959ebd9
Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' 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.
1 year ago
1039fce896
Merge commit '5a5d8a97579bf2da481871588425734678019f52' into glitch-soc/merge-upstream
1 year ago
724f933dac
Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration ( #26178 )
1 year ago
ca6ff4f9a1
Add `published_at` attribute to preview cards ( #26153 )
1 year ago
45950c70a9
Use valid email address for first account ( #26114 )
1 year ago
c6212d89f8
Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' 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`.
1 year ago
5cdc196e44
Rails 7.0 update ( #25668 )
1 year ago
1399e9d863
Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' 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.
1 year ago
d98717ceef
Fix `Style/SlicingWithRange` cop ( #25923 )
1 year ago
96a8aa32ad
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
1 year ago
784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
2c31ac0c39
Fix forgotten unconfirmed_email migration file ( #25702 )
1 year ago
4885232358
Add users index on unconfirmed_email ( #25672 )
1 year ago
e052b71f15
Add superapp index on `oauth_applications` ( #25670 )
1 year ago
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
edb6aab974
Revert "Rails 7 update" ( #25667 )
1 year ago
5cadbaa296
Rails 7 update ( #24241 )
1 year ago
54c3204834
Add index to backups on `user_id` column ( #25647 )
1 year ago
1c25f35ddf
Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' 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.
1 year ago
ee1de4206a
Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
1 year ago
085a1197da
Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' 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.
1 year ago
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
1 year ago
1dd243cc09
Add time zone preference ( #25342 )
1 year ago
83b03b528b
Fix compatibility of recent migration with PostgreSQL 10 ( #25324 )
1 year ago
2252e4d8bb
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
6debddcf89
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>
1 year ago
ac0ecfa421
Add missing primary keys to `accounts_tags` and `statuses_tags` ( #25210 )
1 year ago
53b8a15ee9
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
569302e5ce
Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream
1 year ago
Claire
Matt Jankowski
Christian Schmidt
Eugen Rochko
Nick Schonning
Darius Kazemi