Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 6be21ae8ac9b910677e983c25a6154b4ed905823
Author: Claire <[email protected]>
Date:   Wed Jul 24 22:35:39 2024 +0200

    Fix double indent for post attachments and metadata in grouped notifications (#2793)

commit 0adf31c007cf66474041940bee2b53cdd42c984f
Merge: 44caf314b8 2919d8b097
Author: Claire <[email protected]>
Date:   Wed Jul 24 22:34:01 2024 +0200

    Merge pull request #2794 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to e507d17520facdba0375791c5530485abe9f59ee

commit 2919d8b0979f0da5467105fb311212acf15a24ac
Author: Michael Stanclift <[email protected]>
Date:   Tue Jul 23 10:30:45 2024 -0500

    [Glitch] Recolor Preferences/Admin UI to better match main design

    Port 8b7f93cc7fa7a8421ceddeaa79e487360a4ad223 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit d999fc52ba7f7ce10d1320b081231eae37965e71
Merge: 44caf314b8 06f070d86d
Author: Claire <[email protected]>
Date:   Wed Jul 24 20:07:37 2024 +0200

    Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream

commit 44caf314b8727980dc7bf236e517a30dfe13a37e
Merge: 2656381656 e507d17520
Author: Claire <[email protected]>
Date:   Wed Jul 24 20:07:23 2024 +0200

    Merge pull request #2791 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to cd0ca4b99473f54464e5134f91b7b1c8d5544011

commit 06f070d86d448b97c082c038220becaec8a038ce
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 24 10:13:09 2024 +0200

    fix(deps): update dependency fuzzysort to v3 (#30315)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Renaud Chaput <[email protected]>

commit e507d17520facdba0375791c5530485abe9f59ee
Author: Claire <[email protected]>
Date:   Tue Jul 23 14:11:08 2024 +0200

    [Glitch] Widen the clickable area for statuses in grouped notifications

    Port a8330be93ee825948a17c810af33e28bfa2c56c8 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 977337f2d245a617b970021379189555e8e1edb9
Author: Nick Schonning <[email protected]>
Date:   Tue Jul 23 02:46:09 2024 -0400

    [Glitch] Update Prettier to 3.3.3

    Port 9a015a2a157b43ea63d911327248635e629a72c9 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 838ea5f9cdac103a6f5cc9f63c35315f8985eeb1
Author: Claire <[email protected]>
Date:   Tue Jul 23 08:20:17 2024 +0200

    [Glitch] Fix keyboard shortcuts and navigation in grouped notifications

    Port af06d74574745deb738e6f526f4d74c31760102d to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 68000956f4b43123383f121506a1fbec5a3d2aa2
Merge: 2656381656 cd0ca4b994
Author: Claire <[email protected]>
Date:   Tue Jul 23 19:31:23 2024 +0200

    Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream

commit 8b7f93cc7fa7a8421ceddeaa79e487360a4ad223
Author: Michael Stanclift <[email protected]>
Date:   Tue Jul 23 10:30:45 2024 -0500

    Recolor Preferences/Admin UI to better match main design (#31034)

commit cd0ca4b99473f54464e5134f91b7b1c8d5544011
Author: Adam Niedzielski <[email protected]>
Date:   Tue Jul 23 16:42:31 2024 +0200

    Select correct self link when parsing Webfinger response (#31110)

commit a8330be93ee825948a17c810af33e28bfa2c56c8
Author: Claire <[email protected]>
Date:   Tue Jul 23 14:11:08 2024 +0200

    Widen the clickable area for statuses in grouped notifications (#31111)

commit 2656381656350ccc0fd2e3dc4afd605e696c307f
Merge: ddc1f7ee44 cbf25634a9
Author: Claire <[email protected]>
Date:   Tue Jul 23 14:03:56 2024 +0200

    Merge pull request #2789 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 55705d8191f31c1089095956fb4124f7505b4bd7

commit 871b6197df0be1be9ea597163b8cac0740a8b9e2
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Jul 23 10:59:18 2024 +0200

    chore(deps): update dependency public_suffix to v6.0.1 (#31109)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit bb2e5a4b585875b85f5025a9124b9b476b408c25
Author: Emelia Smith <[email protected]>
Date:   Tue Jul 23 10:12:30 2024 +0200

    Add audit logs to Admin::InstancesController (#27386)

commit 1b839d2cbab2acf6730c73ee7250c4f436cf8489
Author: Matt Jankowski <[email protected]>
Date:   Tue Jul 23 02:51:57 2024 -0400

    Fix `mastodon:stats` decoration of stats rake task (#31104)

commit 9a015a2a157b43ea63d911327248635e629a72c9
Author: Nick Schonning <[email protected]>
Date:   Tue Jul 23 02:46:09 2024 -0400

    Update Prettier to 3.3.3 (#31106)

commit 44bdfe1fed87c77be49b948d9b7ec334558c4c85
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Jul 23 08:42:28 2024 +0200

    chore(deps): update dependency opentelemetry-instrumentation-active_job to v0.7.3 (#31107)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit af06d74574745deb738e6f526f4d74c31760102d
Author: Claire <[email protected]>
Date:   Tue Jul 23 08:20:17 2024 +0200

    Fix keyboard shortcuts and navigation in grouped notifications (#31076)

commit cbf25634a9144bb6420fb0350d7ea64bed4f763f
Author: Claire <[email protected]>
Date:   Mon Jul 22 21:30:06 2024 +0200

    [Glitch] Fix reblogging after refactor

    Port 55705d8191f31c1089095956fb4124f7505b4bd7 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 643b1ef3e97684da49879f9ca7e8781b2f1b3b00
Author: Claire <[email protected]>
Date:   Mon Jul 22 18:03:58 2024 +0200

    [Glitch] Refactor CW handling in an action

    Port 9cb94271333ccfe488fa84d49e3351f18594e480 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit f13a231b3980f76fc5b105ac8e430599df19e956
Author: Claire <[email protected]>
Date:   Mon Jul 22 17:45:07 2024 +0200

    [Glitch] Refactor code for reblogging and favouriting

    Port 03dea64b794f3e6cd1e03df72578ed0004a4d84c to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit dcfcfdcb14e86efe48ab3fa670cb586b341f4384
Merge: ddc1f7ee44 55705d8191
Author: Claire <[email protected]>
Date:   Mon Jul 22 21:41:31 2024 +0200

    Merge commit '55705d8191f31c1089095956fb4124f7505b4bd7' into glitch-soc/merge-upstream

commit 55705d8191f31c1089095956fb4124f7505b4bd7
Author: Claire <[email protected]>
Date:   Mon Jul 22 21:30:06 2024 +0200

    Fix reblogging after refactor (#31105)

commit ddc1f7ee44c3058e7b8430145e88660f4cc9bdc9
Merge: c72b6e03ec 2aac73341a
Author: Claire <[email protected]>
Date:   Mon Jul 22 19:38:53 2024 +0200

    Merge pull request #2788 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 80d9bff6df137afc3376f47b62d10a2e3e9456e2

commit 9cb94271333ccfe488fa84d49e3351f18594e480
Author: Claire <[email protected]>
Date:   Mon Jul 22 18:03:58 2024 +0200

    Refactor CW handling in an action (#31103)

commit 03dea64b794f3e6cd1e03df72578ed0004a4d84c
Author: Claire <[email protected]>
Date:   Mon Jul 22 17:45:07 2024 +0200

    Refactor code for reblogging and favouriting (#31102)

commit 2aac73341a91e61d0b12a2a0272d64500614066e
Merge: c72b6e03ec 80d9bff6df
Author: Claire <[email protected]>
Date:   Mon Jul 22 17:38:30 2024 +0200

    Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream

    Conflicts:
    - `app/services/backup_service.rb`:
      Conflict due to glitch-soc's local-only posts.
      Ported upstream's changes while keeping glitch-soc's feature.

commit 80d9bff6df137afc3376f47b62d10a2e3e9456e2
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 22 15:39:37 2024 +0200

    fix(deps): update dependency immutable to v4.3.7 (#31100)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit ced5e853c7d7c7f2b849d904964ef92e93ad27c8
Author: Claire <[email protected]>
Date:   Mon Jul 22 10:56:05 2024 +0200

    Fix duplicate `orderedItems` in user archive's `outbox.json` (#31099)

commit 6e4305de69bb3356d5d0038611052490527d3325
Author: Matt Jankowski <[email protected]>
Date:   Mon Jul 22 04:02:31 2024 -0400

    Fix spec descriptions around configurable limit values (#31079)

commit 5a60a3b80c8fe1769ba737a286169636476e686c
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Jul 22 10:01:24 2024 +0200

    New Crowdin Translations (automated) (#31087)

    Co-authored-by: GitHub Actions <[email protected]>

commit ef796446e5b0827bc73a27d573b930b27efef579
Author: Matt Jankowski <[email protected]>
Date:   Mon Jul 22 03:46:41 2024 -0400

    Ignore manifest JS parse/interrupt error on CI (#31080)

commit 6ee5d3b5591d96c492035274e4668cfa7891fe70
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 22 09:39:56 2024 +0200

    fix(deps): update dependency jsdom to v24.1.1 (#31088)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 22d2fba2790e258096334d13e4688ae7810ebb4f
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 22 07:39:38 2024 +0000

    chore(deps): update definitelytyped types (non-major) (#31095)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 77ec5e11e4385546e9b10c597c0b40002a809082
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 22 07:38:52 2024 +0000

    chore(deps): update dependency email_spec to v2.3.0 (#31097)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 2774980589fd5d95a2a812527c269a4368e6889e
Author: Claire <[email protected]>
Date:   Mon Jul 22 09:37:27 2024 +0200

    Fix syntax error in grouped notifications CTE on some PostgreSQL versions (#31098)

commit c72b6e03ec6b4042dbf958a979b02cc6870128a9
Merge: 2e63e802b3 95984b729a
Author: Claire <[email protected]>
Date:   Fri Jul 19 18:57:05 2024 +0200

    Merge pull request #2786 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 0397df9bef82042221f35e9938ad5b917fa1d4fc

commit 95984b729a8465da36c51182e0fe5a8e518475cb
Author: Claire <[email protected]>
Date:   Fri Jul 19 17:26:44 2024 +0200

    [Glitch] Remove routerHistory parameters from composer actions

    Port e768b23aa995130c14a7160165eabcf1e8570dfd to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 9f05a06dee264a80827a03569664931f8d443588
Author: Michael Stanclift <[email protected]>
Date:   Fri Jul 19 03:30:26 2024 -0500

    [Glitch] Fix double border on column filter on narrow screens

    Port 784e0885333769b47c8a94fde0c34bb14b1b93bb to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit f7598b267bf952392d8125d8a60bcdb977510ddd
Merge: 2e63e802b3 0397df9bef
Author: Claire <[email protected]>
Date:   Fri Jul 19 17:45:19 2024 +0200

    Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream

commit 0397df9bef82042221f35e9938ad5b917fa1d4fc
Author: Matt Jankowski <[email protected]>
Date:   Fri Jul 19 11:32:42 2024 -0400

    Resolve `TODO` in `api/v1/admin/domain_*` controllers (#31067)

commit 65a8dc7869360bd4e4fb45d876f7a2bd019d16c8
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jul 19 17:32:06 2024 +0200

    chore(deps): update dependency selenium-webdriver to v4.23.0 (#31073)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 3a00f89aa1f2280b995512cd5f91568e6d349cc6
Author: kyori19 <[email protected]>
Date:   Sat Jul 20 00:31:48 2024 +0900

    Respect `Account::DISPLAY_NAME_LENGTH_LIMIT` in account spec correctly (#31075)

commit e768b23aa995130c14a7160165eabcf1e8570dfd
Author: Claire <[email protected]>
Date:   Fri Jul 19 17:26:44 2024 +0200

    Remove routerHistory parameters from composer actions  (#31077)

commit 2e63e802b32599537d80f524628a5affeb089df5
Author: Claire <[email protected]>
Date:   Fri Jul 19 12:13:50 2024 +0200

    Fix inconsistent padding in glitch-soc's grouped notifications (#2784)

commit adadfdbc0355d9195815d25ad22fdee96e13ce6c
Author: Matt Jankowski <[email protected]>
Date:   Fri Jul 19 04:32:43 2024 -0400

    Update `strong_migrations` to version 2.0.0 (#31061)

commit 05342529dd5ecdd6a737451f5c3ca55de24af3e9
Author: Matt Jankowski <[email protected]>
Date:   Fri Jul 19 04:31:34 2024 -0400

    Reduce factory creation in AP activity move spec (#31064)

commit 784e0885333769b47c8a94fde0c34bb14b1b93bb
Author: Michael Stanclift <[email protected]>
Date:   Fri Jul 19 03:30:26 2024 -0500

    Fix double border on column filter on narrow screens (#31068)

commit 8e0aed8ac73dda2138a71a090e1560ace9b9bcf1
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Jul 19 10:21:09 2024 +0200

    New Crowdin Translations (automated) (#31072)

    Co-authored-by: GitHub Actions <[email protected]>

commit d55ecf4145c84c4b4e6a093f01bd84b24d0fc804
Merge: fb29f40a28 7224e24054
Author: Claire <[email protected]>
Date:   Thu Jul 18 20:42:27 2024 +0200

    Merge pull request #2782 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 82344342c1c5adb3f6a4b376559db737a9e982b7

commit 7224e2405413b816b2fbc171a9a9e7b86bae0261
Author: Renaud Chaput <[email protected]>
Date:   Thu Jul 18 16:36:09 2024 +0200

    [Glitch] Grouped Notifications UI

    Port f587ff643f552a32a1c43e103a474a5065cd3657 to glitch-soc

    Co-authored-by: Eugen Rochko <[email protected]>
    Co-authored-by: Claire <[email protected]>
    Signed-off-by: Claire <[email protected]>

commit c75fe09e2b1283c600591d76918921a71ceae989
Merge: fb29f40a28 82344342c1
Author: Claire <[email protected]>
Date:   Thu Jul 18 17:56:25 2024 +0200

    Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream

commit 82344342c1c5adb3f6a4b376559db737a9e982b7
Author: Matt Jankowski <[email protected]>
Date:   Thu Jul 18 11:45:40 2024 -0400

    Add link to org-level contribution guidelines to contributing doc (#31043)

commit 848b59c8ae366895eb690a062698bd8f653e5959
Author: Matt Jankowski <[email protected]>
Date:   Thu Jul 18 11:23:46 2024 -0400

    Reduce factory creation in `MediaAttachment` model spec (#31058)

commit 41b7281b56ea64b13fdf07d5ce7efadcbe65bd1c
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Jul 18 17:23:43 2024 +0200

    fix(deps): update dependency use-debounce to v10.0.1 (#31060)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 6e47637dd4f93169ec783c01f4f9b4dfb7cb66ce
Author: Claire <[email protected]>
Date:   Thu Jul 18 17:23:40 2024 +0200

    Fix grouping across hourly buckets happening in a 12 seconds window instead of 12 hours window (#31062)

commit f587ff643f552a32a1c43e103a474a5065cd3657
Author: Renaud Chaput <[email protected]>
Date:   Thu Jul 18 16:36:09 2024 +0200

    Grouped Notifications UI (#30440)

    Co-authored-by: Eugen Rochko <[email protected]>
    Co-authored-by: Claire <[email protected]>

commit 7d090b2ab6a76676c861f737c3b6922da8c1292b
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Jul 18 10:00:29 2024 +0200

    New Crowdin Translations (automated) (#31055)

    Co-authored-by: GitHub Actions <[email protected]>

commit 47ea83d2469e461b82e6d837ea83ad561128fe7a
Author: Matt Jankowski <[email protected]>
Date:   Thu Jul 18 04:00:19 2024 -0400

    Reduce factory creation in `AP::ProcessStatusUpdateService` spec (#31051)

commit 64c7ffdc656135b7986ce92d645f5355f638cfe4
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Jul 18 09:53:36 2024 +0200

    chore(deps): update dependency ruby-vips to v2.2.2 (#31050)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 2616fde9e6edfbdbf31efad5d1818ad950ab4d4c
Author: Matt Jankowski <[email protected]>
Date:   Thu Jul 18 03:49:44 2024 -0400

    Use change-requiring records in admin/reports controller spec (#31052)

commit c5f8256801c8c840becf0ea7201bb891adf3c35a
Author: Matt Jankowski <[email protected]>
Date:   Thu Jul 18 03:45:59 2024 -0400

    Reduce extra factories in `FanOutOnWriteService` spec (#31053)

commit fb29f40a288b742f4724d50b9d47b800b43aadbb
Merge: d6a2635a77 5e7720d11b
Author: Claire <[email protected]>
Date:   Wed Jul 17 22:42:32 2024 +0200

    Merge pull request #2781 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream up to aa4d8987a00fe82490fb949b82d3baa33d0acd49

commit 5e7720d11bf0dab1be352be0de32598aec0c2c81
Merge: d6a2635a77 aa4d8987a0
Author: Claire <[email protected]>
Date:   Wed Jul 17 22:20:12 2024 +0200

    Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream

commit aa4d8987a00fe82490fb949b82d3baa33d0acd49
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 17 12:42:54 2024 +0200

    chore(deps): update dependency faker to v3.4.2 (#31046)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 4957771a8ae36e46cba4b8c4a6278f0e95e5850a
Author: Claire <[email protected]>
Date:   Wed Jul 17 11:18:25 2024 +0200

    Update rexml to version 3.3.2 (#31048)

commit 76c2c5c748ba47c2b7bc13570cd4301516290d90
Author: Matt Jankowski <[email protected]>
Date:   Wed Jul 17 04:09:34 2024 -0400

    Reduce extra round trips in `activitypub` controller specs (#31041)

commit f5e90f3de3efa52c9f8ea72ffdbf091d5032cc4b
Author: Matt Jankowski <[email protected]>
Date:   Wed Jul 17 03:33:08 2024 -0400

    Reduce extra round trips in `AP::SynchronizeFollowersService` spec (#31044)

commit 81877e79505f387284c7a9de88f631eab758a319
Author: Matt Jankowski <[email protected]>
Date:   Wed Jul 17 03:24:14 2024 -0400

    Reduce extra round trips in `AP::FetchRemoteStatusService` spec (#31045)

commit 00c110ac7ba0dd82840f1ff32113ed0e616c3470
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Jul 17 09:23:07 2024 +0200

    New Crowdin Translations (automated) (#31047)

    Co-authored-by: GitHub Actions <[email protected]>

commit d6a2635a774248520e1affd58d3317b0dd72ab48
Merge: b7b6f1c89a c546757cd1
Author: Claire <[email protected]>
Date:   Tue Jul 16 18:51:02 2024 +0200

    Merge pull request #2780 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 66430cb25c824cfad0394216d8e7a523533bcf4b

commit c546757cd1c93a4b34b232e9f911b06ffe0e326a
Merge: b7b6f1c89a 66430cb25c
Author: Claire <[email protected]>
Date:   Tue Jul 16 17:54:36 2024 +0200

    Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream

commit 66430cb25c824cfad0394216d8e7a523533bcf4b
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Jul 16 17:24:56 2024 +0200

    New Crowdin Translations (automated) (#31038)

    Co-authored-by: GitHub Actions <[email protected]>

commit a609940ec9a370a18789ad87532a098fe6e564c9
Author: Adam Niedzielski <[email protected]>
Date:   Tue Jul 16 15:23:26 2024 +0200

    Fix test description in hashtag_bar (#30827)

commit aa88aca0ad89f24fead6a1c6dbfad9def94bd47e
Author: Emelia Smith <[email protected]>
Date:   Tue Jul 16 15:23:08 2024 +0200

    Add optional OAuth application to reports (#30539)

commit fa54b6121691dfb5d64a42aa6bf07b4d67aa504f
Author: Adam Niedzielski <[email protected]>
Date:   Tue Jul 16 15:21:16 2024 +0200

    Handle missing links in Webfinger response (#31030)

commit c27d194eb27aeedb16e17dfb2a8f2be7c0636851
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Jul 16 15:20:34 2024 +0200

    fix(deps): update dependency pino to v9.3.1 (#31032)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit c3a2f9d99309bbe2754be9ea3f5257c434ff34b0
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Jul 16 14:14:25 2024 +0200

    chore(deps): update dependency json-schema to v4.3.1 (#31012)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 905921b2efaa7bda5acca1c19056a18186ec24ff
Author: Michael Stanclift <[email protected]>
Date:   Tue Jul 16 02:06:19 2024 -0500

    Add missing "Update Report" string in audit log (#31033)

commit b7b6f1c89a001a004ca97937d8f43a4555159b31
Merge: d329eda295 70969ac64c
Author: Claire <[email protected]>
Date:   Mon Jul 15 19:35:20 2024 +0200

    Merge pull request #2777 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 9d0bce40724eb77b7cc3917091b62e4ab159e29e

commit 70969ac64c4cf2811be9aa2f8510e3d831f2533c
Author: David Roetzel <[email protected]>
Date:   Mon Jul 15 15:42:47 2024 +0200

    [Glitch] Move filtered notifications bar in scrollable area

    Port 9d0bce40724eb77b7cc3917091b62e4ab159e29e to glitch-soc

    Co-authored-by: Claire <[email protected]>
    Signed-off-by: Claire <[email protected]>

commit 64b2c712d4318445716a1f3f6e77fd005d07a7d9
Merge: d329eda295 9d0bce4072
Author: Claire <[email protected]>
Date:   Mon Jul 15 18:51:38 2024 +0200

    Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream

    Conflicts:
    - `app/helpers/theme_helper.rb`:
      Conflict because upstream refactored theme-related code, and glitch-soc has
      a different theming system.

commit 9d0bce40724eb77b7cc3917091b62e4ab159e29e
Author: David Roetzel <[email protected]>
Date:   Mon Jul 15 15:42:47 2024 +0200

    Move filtered notifications bar in scrollable area (#30996)

    Co-authored-by: Claire <[email protected]>

commit 0b97ec3f7b0922067c1047d621975e65bfe96ad7
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 15 15:03:57 2024 +0200

    fix(deps): update dependency @babel/core to v7.24.9 (#31029)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 543b59fa14a7e9b55a5a96d2cb0f38391108a561
Author: Matt Jankowski <[email protected]>
Date:   Mon Jul 15 09:03:23 2024 -0400

    Clean up `theme_helper` style builders (#30617)

commit 91ef4a6fc5d8536378a2d3bc456711bcb95bd8f4
Author: Matt Jankowski <[email protected]>
Date:   Mon Jul 15 06:42:18 2024 -0400

    Add assertion about key columns to account key generate spec (#30635)

commit 1dd82620712eecc18f1acd72b5a8585d37e254cf
Author: Claire <[email protected]>
Date:   Mon Jul 15 11:29:57 2024 +0200

    Add optional `filtered` attribute to notification entities in REST API (#31011)

commit 17117109adacd5811317b4927594992a9c5ddffb
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Jul 15 07:44:37 2024 +0000

    New Crowdin Translations (automated) (#31018)

    Co-authored-by: GitHub Actions <[email protected]>

commit d61b536df30c6368a45fd4750c01322b14011b48
Author: mogaminsk <[email protected]>
Date:   Mon Jul 15 16:38:48 2024 +0900

    Add i18n strings for instance favicon and logo settings label (#31016)

commit d329eda295dc73a1f2aaf0d412b5ce12314d1fc9
Merge: 54642244ed edec2e9fdf
Author: Claire <[email protected]>
Date:   Sun Jul 14 19:40:29 2024 +0200

    Merge pull request #2776 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 00cb4a0313190bfa118966692a649db9c8328094

commit edec2e9fdfdf18ffa5d5591e7ae9d75e94209265
Merge: 54642244ed 00cb4a0313
Author: Claire <[email protected]>
Date:   Sun Jul 14 18:43:35 2024 +0200

    Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream

commit 54642244ed0392cc2464ffdb354298549c646f61
Merge: 813f86d6ff 8d2a93b0cb
Author: Claire <[email protected]>
Date:   Fri Jul 12 17:14:23 2024 +0200

    Merge pull request #2775 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to c929b4cace3f95fe54fdafe449ea7e972c8d61e8

commit 00cb4a0313190bfa118966692a649db9c8328094
Author: Matt Jankowski <[email protected]>
Date:   Fri Jul 12 10:09:16 2024 -0400

    Avoid repeated factory creation in media_attachments_vacuum_spec (#31000)

commit c953dca1dee71f32b547e68977568cd076a6f7ae
Author: Emelia Smith <[email protected]>
Date:   Fri Jul 12 14:23:09 2024 +0200

    Streaming: use pgPool.query instead of manually acquiring & releasing a connection (#30964)

commit b87c41115e99becdfc8a6a66300b4fc6fe39bf3b
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jul 12 14:20:32 2024 +0200

    chore(deps): update dependency rubocop-rspec to v3.0.3 (#31009)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 35a437a03f4e1f606afea8953f0be62807da91cc
Author: David Roetzel <[email protected]>
Date:   Fri Jul 12 14:09:52 2024 +0200

    Destroy `NotificationRequest`s that are dismissed (#31008)

commit 8d2a93b0cba756d1fffdbc6f2d2ffa39b571044b
Author: Claire <[email protected]>
Date:   Thu Jul 11 21:42:58 2024 +0200

    [Glitch] Add setting to disable hover cards

    Port ad52b04a1c88574ae3be2c56bead1b0638b253fc to glitch-soc

    Co-authored-by: Eugen Rochko <[email protected]>

commit 55cf5e0188834680efdc8ea4fa411ddd797ca372
Merge: 813f86d6ff c929b4cace
Author: Claire <[email protected]>
Date:   Fri Jul 12 13:41:54 2024 +0200

    Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream

commit c929b4cace3f95fe54fdafe449ea7e972c8d61e8
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jul 12 11:29:43 2024 +0200

    chore(deps): update dependency pghero to v3.6.0 (#30994)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 9cc0607358dda4e3dd46e7bcee05e6545175f626
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jul 12 11:29:10 2024 +0200

    chore(deps): update dependency database_cleaner-active_record to v2.2.0 (#31007)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 43e24dbb13f497cf13bf301e40f8790ba5960f2d
Author: Matt Jankowski <[email protected]>
Date:   Fri Jul 12 04:30:52 2024 -0400

    Use `include_pagination_headers` in more places (#30999)

commit 28ad3588e4936f3429e5f062c76c37f50a2f38fb
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Jul 12 08:25:27 2024 +0000

    New Crowdin Translations (automated) (#31006)

    Co-authored-by: GitHub Actions <[email protected]>

commit fdad4dc918d0eb8538d79173e86c82fd6d0290a6
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jul 12 10:23:04 2024 +0200

    fix(deps): update babel monorepo to v7.24.8 (#31002)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit cd1bc94cd2232b2583c6d3d1924fd0ae00f542bc
Author: Nick Schonning <[email protected]>
Date:   Fri Jul 12 04:22:31 2024 -0400

    Regen RuboCop TODO for 1.65.0 (#31003)

commit 73d53827ea3ef1605f97f99bf3cbeeccb30638be
Author: Matt Jankowski <[email protected]>
Date:   Fri Jul 12 04:19:15 2024 -0400

    Add change assertion to invites destroy spec (#31004)

commit bb702e6b2037b5b0f2e76b6f9d390fa0fd7abc54
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jul 12 10:18:35 2024 +0200

    fix(deps): update dependency sass to v1.77.8 (#31005)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 813f86d6ffaedc0398c7c69e75bbd8af77dd04c6
Merge: 182fee1c45 e26052192d
Author: Claire <[email protected]>
Date:   Thu Jul 11 22:57:59 2024 +0200

    Merge pull request #2774 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 8c8bee5a36e0cd0b5d35903f8891896447c3e060

commit ad52b04a1c88574ae3be2c56bead1b0638b253fc
Author: Claire <[email protected]>
Date:   Thu Jul 11 21:42:58 2024 +0200

    Add setting to disable hover cards (#30931)

    Co-authored-by: Eugen Rochko <[email protected]>

commit e26052192d2bc11ef8adb7bb5f9d4d0fcbfc94f4
Author: Renaud Chaput <[email protected]>
Date:   Thu Jul 11 15:43:42 2024 +0200

    [Glitch] Change disabled buttons color in light mode to make it more visible

    Port 8c8bee5a36e0cd0b5d35903f8891896447c3e060 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit db0b12e5dcadf18c266dd2e4baa7e083a5830a3e
Merge: 182fee1c45 8c8bee5a36
Author: Claire <[email protected]>
Date:   Thu Jul 11 21:07:03 2024 +0200

    Merge commit '8c8bee5a36e0cd0b5d35903f8891896447c3e060' into glitch-soc/merge-upstream

commit 8c8bee5a36e0cd0b5d35903f8891896447c3e060
Author: Renaud Chaput <[email protected]>
Date:   Thu Jul 11 15:43:42 2024 +0200

    Change disabled buttons color in light mode to make it more visible (#30998)

commit 6c375297236ecd1df7a5e82c24ad025b46be46cc
Author: Matt Jankowski <[email protected]>
Date:   Thu Jul 11 07:13:55 2024 -0400

    Use `module: :auth` to wrap `devise_for` routes config (#30990)

commit c244b70dc21f1a41f16588820490082a1e99b7ae
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Jul 11 10:38:35 2024 +0000

    New Crowdin Translations (automated) (#30993)

    Co-authored-by: GitHub Actions <[email protected]>

commit 24bdba34132b0a6e193e7246304601a8ad453425
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Jul 11 12:30:55 2024 +0200

    chore(deps): update dependency rubocop to v1.65.0 (#30985)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 631a5eec85946848bf0b15562f82260c1f7721d8
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 10 21:59:34 2024 +0200

    chore(deps): update dependency charlock_holmes to v0.7.9 (#30992)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 182fee1c454dcd71ecf408ddc2c534bf6ee3a49a
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Jul 10 18:18:15 2024 +0200

    New Crowdin Translations (automated) (#2738)

    * New Crowdin translations

    * Fix bogus no.yml

    * Fix bogus simple_form.no.yml

    ---------

    Co-authored-by: GitHub Actions <[email protected]>
    Co-authored-by: Claire <[email protected]>

commit 5c9c02417a0cde8a0b73d31f5b3f0551f83ab936
Merge: 56e347d149 959ad1d6be
Author: Claire <[email protected]>
Date:   Wed Jul 10 18:11:50 2024 +0200

    Merge pull request #2772 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 2ea9336b6855b44126a55106a81e96ea68eaf8ff

commit d436696f46814eb4c786e48dec6dd05b4bb5c278
Author: Emelia Smith <[email protected]>
Date:   Wed Jul 10 17:59:18 2024 +0200

    Streaming: Fix incorrect type definitions (#30977)

commit 959ad1d6be5b84bd55df4e7ad04cc94e824fce5c
Author: Claire <[email protected]>
Date:   Wed Jul 10 17:46:33 2024 +0200

    Fix deprecation warning in win95 theme

commit 0d4a8a53d548aa4db43e52085f85126c2bf543d1
Author: Renaud Chaput <[email protected]>
Date:   Wed Jul 10 14:23:24 2024 +0200

    [Glitch] Fix SCSS mixed declarations deprecation

    Port 182b9248c0e798e4b0fba8339d2817ed2f094b42 to glitch-soc

commit 52fb4f16ef561adb79e47e91f803176929d7ace4
Merge: 56e347d149 2ea9336b68
Author: Claire <[email protected]>
Date:   Wed Jul 10 16:58:06 2024 +0200

    Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream

commit 2ea9336b6855b44126a55106a81e96ea68eaf8ff
Author: David Roetzel <[email protected]>
Date:   Wed Jul 10 16:25:39 2024 +0200

    Do not pass unknown encoding names to nokogiri. (#30987)

commit 36592d10aa497db6c9a9764ee539242cc2cfdec7
Author: Renaud Chaput <[email protected]>
Date:   Wed Jul 10 14:57:25 2024 +0200

    Change Sidekiq readiness file to use an environment variable (#30988)

commit 182b9248c0e798e4b0fba8339d2817ed2f094b42
Author: Renaud Chaput <[email protected]>
Date:   Wed Jul 10 14:23:24 2024 +0200

    Fix SCSS mixed declarations deprecation (#30986)

commit 9984fca9a065e49acde0858487bc3cf10a744cea
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Jul 10 12:40:19 2024 +0200

    New Crowdin Translations (automated) (#30983)

    Co-authored-by: GitHub Actions <[email protected]>

commit 8dea897a3b2a6be08911515d291eb679dc3cd792
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 10 10:04:52 2024 +0000

    chore(deps): update docker.io/ruby docker tag to v3.3.4 (#30980)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit d0137910c61a565cfdaa8cf29d3e15e6345e5066
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 10 12:04:11 2024 +0200

    chore(deps): update dependency ruby to v3.3.4 (#30969)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit c9f08f77ed8a262a4db806d814e2701794873a70
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 10 08:55:26 2024 +0200

    fix(deps): update dependency sass to v1.77.7 (#30981)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 56e347d1493b81bb8f6c25aef2616cadf327313d
Merge: 3e47d01a30 388672ff0d
Author: Claire <[email protected]>
Date:   Tue Jul 9 23:20:17 2024 +0200

    Merge pull request #2771 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 967505ee9bcacf0e5189aa06c654ff586c198a46

commit 388672ff0de782350a3b18d5831614dfdefe70a2
Merge: 3e47d01a30 967505ee9b
Author: Claire <[email protected]>
Date:   Tue Jul 9 20:39:09 2024 +0200

    Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream

commit 967505ee9bcacf0e5189aa06c654ff586c198a46
Author: David Roetzel <[email protected]>
Date:   Tue Jul 9 15:11:34 2024 +0200

    Add size limit for all PreviewCard URLs (#30973)

commit ef2e48e6dac1ed327fc6ac07b0adf252d10ff607
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Jul 9 14:53:31 2024 +0200

    fix(deps): update dependency glob to v10.4.5 (#30972)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 3875bd138d279eb26efce9f446fe91f49cf38f55
Author: Daniel M Brasil <[email protected]>
Date:   Tue Jul 9 09:41:49 2024 -0300

    Fix HTTP 500 in `/api/v1/polls/:id/votes` (#25598)

commit 7542a134d5fecf82d14dcc1860be87cf6645ec7f
Author: Renaud Chaput <[email protected]>
Date:   Tue Jul 9 12:47:08 2024 +0200

    Add a file for Sidekiq to signal it is ready to process jobs (#30971)

commit 249b4117f9fbdac3888d3807a81c0e83e39d7de5
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Jul 9 07:36:13 2024 +0000

    New Crowdin Translations (automated) (#30970)

    Co-authored-by: GitHub Actions <[email protected]>

commit f47d761e12a16c4338447aa8dbeca8365ee812cc
Author: Matt Jankowski <[email protected]>
Date:   Tue Jul 9 03:34:19 2024 -0400

    Remove unneeded `controller` option in routes (#30958)

commit 7a30c689530c93e8ea473e39cfb2e2ff6d9d2807
Author: Matt Jankowski <[email protected]>
Date:   Tue Jul 9 03:34:15 2024 -0400

    Use `scope module: ...` block for `.well-known` routes (#30959)

commit 0dd4595704896fecb69315c1617dcb74b1cfaf67
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Jul 9 09:27:13 2024 +0200

    fix(deps): update dependency glob to v10.4.4 (#30967)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 3e47d01a3035db72aa8fe4b978d03c671fbd55ec
Merge: 69766370fd 80179d53ba
Author: Claire <[email protected]>
Date:   Mon Jul 8 22:02:56 2024 +0200

    Merge pull request #2770 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to fa8e972722fb8fc056aa348dddaee4005b4a8ac4

commit 80179d53ba825c2c82178a267498311edde077f3
Author: Tianwei Dong <[email protected]>
Date:   Mon Jul 8 09:10:57 2024 +0100

    [Glitch] Change to use an unified constant for max media attachments per status

    Port 36d819bef34279bb36cdfa3ed89711405ad79591 to glitch-soc

    Co-authored-by: Renaud Chaput <[email protected]>
    Signed-off-by: Claire <[email protected]>

commit aa8ad92fa423d02991e92cfd571ef7b5393ebbb5
Author: Renaud Chaput <[email protected]>
Date:   Sun Jul 7 18:14:15 2024 +0200

    [Glitch] Remove the `title` attribute when hovering a card anchor

    Port 981395e4d68a1c0cfccbdb8924bc11ac912d1e05 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 2fa3c3a748a3a647bae2d8fc2d1bf4776871ea8b
Author: Renaud Chaput <[email protected]>
Date:   Sun Jul 7 18:13:10 2024 +0200

    [Glitch] Add the account hover card for account search results

    Port 0899c91d4be0e0846caf53a4b065c4904f34d23a to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 6a552329881a896edb27d0eb955baabcb45938da
Merge: 69766370fd fa8e972722
Author: Claire <[email protected]>
Date:   Mon Jul 8 19:41:14 2024 +0200

    Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream

commit fa8e972722fb8fc056aa348dddaee4005b4a8ac4
Author: David Roetzel <[email protected]>
Date:   Mon Jul 8 18:04:36 2024 +0200

    Fix author names as arrays in linked data. (#30957)

commit f1300ad284d8c7877a7406e253cf7558596d9837
Author: Matt Jankowski <[email protected]>
Date:   Mon Jul 8 12:01:08 2024 -0400

    Rename jobs/attachments rspec tag names (#29762)

commit 79b0e192d9fb06dbf203e05e6f621dc3ef4d8c73
Author: Matt Jankowski <[email protected]>
Date:   Mon Jul 8 04:16:00 2024 -0400

    Move test migrations paths check to workflow level (#30702)

commit 36d819bef34279bb36cdfa3ed89711405ad79591
Author: Tianwei Dong <[email protected]>
Date:   Mon Jul 8 09:10:57 2024 +0100

    Change to use an unified constant for max media attachments per status (#29073)

    Co-authored-by: Renaud Chaput <[email protected]>

commit 1a37862a7606058026b1e55b767f38a6f82da504
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Jul 8 10:03:44 2024 +0200

    New Crowdin Translations (automated) (#30940)

    Co-authored-by: GitHub Actions <[email protected]>

commit d41b43ed4fff8ccbee5eac62064c5def14f88973
Author: Claire <[email protected]>
Date:   Mon Jul 8 09:41:50 2024 +0200

    Limit attachments to `MEDIA_ATTACHMENTS_LIMIT` when returning posts through the API (#30932)

commit fd3bfc0710999923c722222579395e9a3d9e3c73
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 8 07:22:28 2024 +0000

    fix(deps): update dependency postcss-preset-env to v9.6.0 (#30944)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit c29fdadefdaae5a68f6bea85d6ae3b529b6ab7e7
Author: Matt Jankowski <[email protected]>
Date:   Mon Jul 8 03:21:49 2024 -0400

    Use `scope module: ...` for more API routes (#30935)

commit bd285cdd02a079b6c1412be04cd28cf759fd0d9d
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 8 09:16:47 2024 +0200

    fix(deps): update dependency glob to v10.4.3 (#30941)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit bd8481784870b04cd4fda20fa18fdeeb7a07430d
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 8 07:15:48 2024 +0000

    chore(deps): update dependency irb to v1.14.0 (#30947)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 5c3ec727ecff6fe74b12ae533388dbc28b5061fe
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 8 09:11:29 2024 +0200

    chore(deps): update dependency typescript to v5.5.3 (#30953)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit c5883e099937971e30eb17f6da3e5e8800523cfa
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 8 09:11:15 2024 +0200

    chore(deps): update dependency @testing-library/dom to v10.3.1 (#30954)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 981395e4d68a1c0cfccbdb8924bc11ac912d1e05
Author: Renaud Chaput <[email protected]>
Date:   Sun Jul 7 18:14:15 2024 +0200

    Remove the `title` attribute when hovering a card anchor (#30948)

commit 0899c91d4be0e0846caf53a4b065c4904f34d23a
Author: Renaud Chaput <[email protected]>
Date:   Sun Jul 7 18:13:10 2024 +0200

    Add the account hover card for account search results (#30949)

commit 69766370fd65bb7a48dddfd247e0b22f72409f4f
Merge: 05cfe04415 a99ae90d76
Author: Claire <[email protected]>
Date:   Sun Jul 7 15:22:37 2024 +0200

    Merge pull request #2768 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 63ba69810eca80fc2d10114a79f2988c1b75892f

commit 1d35626dc7f8422e7b2da9a5e3560fa8f6aa0a25
Author: Matt Jankowski <[email protected]>
Date:   Sun Jul 7 05:39:31 2024 -0400

    Limit CI push triggers to `main` and `stable-*` branches (#30934)

commit a99ae90d76d91285c0336411742fa88618af8775
Author: Claire <[email protected]>
Date:   Sat Jul 6 09:22:24 2024 +0200

    [Glitch] Fix overflow behavior on profile fields in hover cards

    Port 63ba69810eca80fc2d10114a79f2988c1b75892f to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit aca1decf541ed7ac60176e2f0cf33ee4a481685f
Author: Claire <[email protected]>
Date:   Fri Jul 5 15:40:53 2024 +0200

    [Glitch] Fix right-to-left text in preview cards

    Port 8f5694d79e531b94784697d92bed24d003d77353 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 11dd51ef44b14d483b49f7bebed845c1ee85a107
Merge: 05cfe04415 63ba69810e
Author: Claire <[email protected]>
Date:   Sat Jul 6 21:02:42 2024 +0200

    Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream

    Conflicts:
    - `.env.production.sample`:
      Upstream and glitch-soc had different comments, some comments got updated upstream.
      Updated them in glitch-soc accordingly.

commit 63ba69810eca80fc2d10114a79f2988c1b75892f
Author: Claire <[email protected]>
Date:   Sat Jul 6 09:22:24 2024 +0200

    Fix overflow behavior on profile fields in hover cards (#30928)

commit 8f5694d79e531b94784697d92bed24d003d77353
Author: Claire <[email protected]>
Date:   Fri Jul 5 15:40:53 2024 +0200

    Fix right-to-left text in preview cards (#30930)

commit 97eddb5906640a79a1cba20823ce10e986f7f317
Author: David Roetzel <[email protected]>
Date:   Fri Jul 5 15:28:52 2024 +0200

    Fix details extraction when no title exists. (#30933)

commit 016c1e4e788890f0c81a47640f76de136a0a8f32
Author: David Roetzel <[email protected]>
Date:   Fri Jul 5 13:54:38 2024 +0200

    Improve handling of encoding problems when creating link previews (#30929)

commit 05f0d510052fb56478986c474192abc7cea3e775
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jul 5 13:32:29 2024 +0200

    chore(deps): update dependency sidekiq-scheduler to v5.0.5 (#30918)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit a16c2c99b576b6815c9fefede9acc0be0d60d54d
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jul 5 11:51:55 2024 +0200

    fix(deps): update dependency cssnano to v7.0.4 (#30927)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 81547845ac73f860df2c86594fe0bf346745ce0e
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Jul 5 11:09:40 2024 +0200

    New Crowdin Translations (automated) (#30925)

    Co-authored-by: GitHub Actions <[email protected]>

commit 8c375d8a5c899b735950a7a88670a1bb2b7adcd2
Author: Matt Jankowski <[email protected]>
Date:   Fri Jul 5 04:57:54 2024 -0400

    Use `scope module: ...` for settings/2FA routes (#30919)

commit 8de5df225edb89ef13f5ea2697876018953a97d9
Author: Claire <[email protected]>
Date:   Fri Jul 5 10:54:45 2024 +0200

    Change instructions to use `bundle exec rails` instead of `rake` (#30917)

commit 05cfe04415084995ccc01b6c737edb39c9dd8411
Merge: 58f027a019 e61a7794f8
Author: Claire <[email protected]>
Date:   Thu Jul 4 17:28:51 2024 +0200

    Merge pull request #2765 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to df9e26158d9787859b24bdc276af478abf05e1af

commit e61a7794f8c58827bccf02a265fd3e35a489ac32
Merge: 58f027a019 df9e26158d
Author: Claire <[email protected]>
Date:   Thu Jul 4 17:12:14 2024 +0200

    Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream

    Conflicts:
    - `lib/sanitize_ext/sanitize_config.rb`:
      Conflict because glitch-soc has a different list of allowed tags.
      Added upstream's new allowed tags while keeping ours.
    - `spec/requests/api/v1/timelines/public_spec.rb`:
      Conflict because of glitch-soc's default settings.
      Updated accordingly.

commit df9e26158d9787859b24bdc276af478abf05e1af
Author: Claire <[email protected]>
Date:   Thu Jul 4 16:59:54 2024 +0200

    Bump version to v4.3.0-alpha.5 (#30920)

commit d3a056adfd0eca4fff57dde65ee9d95ce7c9bb3e
Author: Claire <[email protected]>
Date:   Thu Jul 4 16:45:52 2024 +0200

    Merge pull request from GHSA-xjvf-fm67-4qc3

commit 502cf75b160c76f963a179d46498e3ea1a9fefca
Author: Claire <[email protected]>
Date:   Thu Jul 4 16:26:49 2024 +0200

    Merge pull request from GHSA-58x8-3qxw-6hm7

    * Fix insufficient permission checking for public timeline endpoints

    Note that this changes unauthenticated access failure code from 401 to 422

    * Add more tests for public timelines

    * Require user token in `/api/v1/statuses/:id/translate` and `/api/v1/scheduled_statuses`

commit 395f17ca17b27f9e722425a4d76ef1b02bcebea8
Author: Claire <[email protected]>
Date:   Thu Jul 4 16:11:28 2024 +0200

    Merge pull request from GHSA-vp5r-5pgw-jwqx

    * Fix streaming sessions not being closed when revoking access to an app

    * Add tests for GHSA-7w3c-p9j8-mq3x

commit b73014761807f3171b7ecb46052e9aa618b9c029
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Jul 4 15:46:14 2024 +0200

    fix(deps): update dependency ws to v8.18.0 (#30914)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 528661a091bbef5b5359bfacd1478231a1cb7d10
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Jul 4 15:46:08 2024 +0200

    fix(deps): update dependency pino-http to v10.2.0 (#30913)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 8331f9e379220847020aed9cd0a8a1d6ab0e7d43
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Jul 4 10:46:27 2024 +0200

    New Crowdin Translations (automated) (#30916)

    Co-authored-by: GitHub Actions <[email protected]>

commit 58f027a0190c10053b71ed23023bc97aa32cef6f
Merge: 71375e984f 70ff7a7c69
Author: Claire <[email protected]>
Date:   Wed Jul 3 22:56:52 2024 +0200

    Merge pull request #2763 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 9be77fc0dbb01c1a8a54cd3da97e16c7941df367

commit 70ff7a7c6943b64c005d6abe91491a7125e53486
Merge: 71375e984f 9be77fc0db
Author: Claire <[email protected]>
Date:   Wed Jul 3 22:10:41 2024 +0200

    Merge commit '9be77fc0dbb01c1a8a54cd3da97e16c7941df367' into glitch-soc/merge-upstream

commit 47f0faebc9cb197ea7b4cf8d191df0a1ec926f59
Author: Emelia Smith <[email protected]>
Date:   Wed Jul 3 22:05:59 2024 +0200

    Implement HTML ruby tags for east-asian languages (#30897)

commit 9be77fc0dbb01c1a8a54cd3da97e16c7941df367
Author: David Roetzel <[email protected]>
Date:   Wed Jul 3 15:36:42 2024 +0200

    Revert "Add system check for missing database indexes" (#30909)

commit 20c749bd45286fbf0aca5610562e5dc6f2c616dd
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 3 11:14:15 2024 +0200

    chore(deps): update dependency rubocop-rspec to v3.0.2 (#30902)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit f99159d1eb671d72138edc42d11cd58472c33aec
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 3 10:46:51 2024 +0200

    fix(deps): update dependency webpack-merge to v6 (#30891)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 6270281037c1f0991bfbf8d195280be3f5733bf3
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 3 08:05:19 2024 +0000

    chore(deps): update dependency doorkeeper to v5.7.1 (#30053)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 1dbffc30f12d20f3c5f038c72b06967480f82129
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 3 08:04:38 2024 +0000

    chore(deps): update opentelemetry-ruby (non-major) (#30903)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 5651c16d11a3bb35e44c260b0c18afcd451fd5aa
Author: Matt Jankowski <[email protected]>
Date:   Wed Jul 3 03:47:40 2024 -0400

    Limit `browser` version to enforce ruby 3.1 support (#30766)

commit dd85e3bcc5e04a11775cbdd9cb1f7d3577ddd9d7
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Jul 3 07:30:30 2024 +0000

    New Crowdin Translations (automated) (#30901)

    Co-authored-by: GitHub Actions <[email protected]>

commit ba7e7a6368f4e6097a7c6ee7145c5ff43e906517
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 3 09:21:05 2024 +0200

    chore(deps): update opentelemetry-ruby (non-major) (#30898)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 2e295bd5e7d3e7fefd4d4f03279f0dd0f3e5427d
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Jul 3 07:20:48 2024 +0000

    chore(deps): update dependency aws-sdk-s3 to v1.156.0 (#30899)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit ebd8e1bbb6465c78f6542fe7f09938fdb768dbb7
Author: David Roetzel <[email protected]>
Date:   Wed Jul 3 09:19:54 2024 +0200

    Add system check for missing database indexes (#30888)

commit 1fc14e324bf103e379cf73ffceebbf46472cccde
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Jul 2 10:41:54 2024 +0200

    New Crowdin Translations (automated) (#30890)

    Co-authored-by: GitHub Actions <[email protected]>

commit 71375e984f47e9754576113e223c268489d75f11
Merge: 6d6064d2c0 4d4f7ede4f
Author: Claire <[email protected]>
Date:   Mon Jul 1 23:53:33 2024 +0200

    Merge pull request #2761 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to d3f504245cab5a9a0e89262e0a1398d035dffac9

commit 4d4f7ede4f10c9d10e480f525b989700181b4864
Author: Claire <[email protected]>
Date:   Mon Jul 1 21:21:22 2024 +0200

    Revert "Temporarily disable hover cards"

    This reverts commit 935b955b156f6313e1a4555dbb7b0661c2de1e0a.

commit 4c5067e3a45a446491481b370702885bc07bc77c
Author: Eugen Rochko <[email protected]>
Date:   Mon Jul 1 16:45:48 2024 +0200

    [Glitch] Add timeline of public posts about a trending link in web UI

    Port 20fa9ce4845f1b6c8a7223f08409091808fa9bc0 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit a70b1141d6d3039ab43366561037ea28a2747d6f
Author: Eugen Rochko <[email protected]>
Date:   Mon Jul 1 20:10:22 2024 +0200

    [Glitch] Fix missing confirmation when unfollowing from hover card in web UI

    Port d3f504245cab5a9a0e89262e0a1398d035dffac9 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit dcfd39991b78d308d6a92ebb8c6e33c860747541
Author: Eugen Rochko <[email protected]>
Date:   Mon Jul 1 17:52:01 2024 +0200

    [Glitch] Change hover cards to not appear until the mouse stops in web UI

    Port b728c0e8ce9ac3a74f116bedff85e36dd7cc6a1e to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 92dcc502786f75755ed596cea53273a31e240b4d
Merge: d270165be3 d3f504245c
Author: Claire <[email protected]>
Date:   Mon Jul 1 20:45:13 2024 +0200

    Merge commit 'd3f504245cab5a9a0e89262e0a1398d035dffac9' into glitch-soc/merge-upstream

commit d3f504245cab5a9a0e89262e0a1398d035dffac9
Author: Eugen Rochko <[email protected]>
Date:   Mon Jul 1 20:10:22 2024 +0200

    Fix missing confirmation when unfollowing from hover card in web UI (#30879)

commit b728c0e8ce9ac3a74f116bedff85e36dd7cc6a1e
Author: Eugen Rochko <[email protected]>
Date:   Mon Jul 1 17:52:01 2024 +0200

    Change hover cards to not appear until the mouse stops in web UI (#30850)

commit 20fa9ce4845f1b6c8a7223f08409091808fa9bc0
Author: Eugen Rochko <[email protected]>
Date:   Mon Jul 1 16:45:48 2024 +0200

    Add timeline of public posts about a trending link in web UI (#30840)

commit d270165be3b3ec7f442ec8a4c5f511168da7397a
Merge: 6d6064d2c0 aeefe5b2be
Author: Claire <[email protected]>
Date:   Mon Jul 1 12:05:39 2024 +0200

    Merge commit 'aeefe5b2bea6e0fb511f029c2aacdefa7bd41eb8' into glitch-soc/merge-upstream

commit aeefe5b2bea6e0fb511f029c2aacdefa7bd41eb8
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 1 09:03:38 2024 +0000

    chore(deps): update eslint (non-major) (#30883)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit aefb4c027b035bc3022343157d31117e7ae531b4
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 1 08:35:19 2024 +0000

    chore(deps): update dependency rubocop-rails to v2.25.1 (#30876)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 7756db65519136d92b04b8709681f62a971836f7
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Jul 1 08:34:38 2024 +0000

    New Crowdin Translations (automated) (#30873)

    Co-authored-by: GitHub Actions <[email protected]>

commit ed15ae075c00b72388d06f1d62b87a6ed2028e57
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 1 08:27:03 2024 +0000

    fix(deps): update dependency @reduxjs/toolkit to v2.2.6 (#30875)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 4c701463b4717acfdf37d5992bf1d729c2221011
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 1 08:26:08 2024 +0000

    chore(deps): update dependency aws-sdk-s3 to v1.155.0 (#30871)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 2f1df842f8ba3ec064a560685f51489aee3a5ecf
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 1 10:25:52 2024 +0200

    chore(deps): update dependency test-prof to v1.3.3.1 (#30872)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 3c1e1685c73fa69dec719cb0bf2847de6df31dd1
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 1 10:21:55 2024 +0200

    fix(deps): update dependency postcss to v8.4.39 (#30877)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 9c7d56db9a30e35d54974ea9257c2b48545b5217
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 1 10:21:40 2024 +0200

    fix(deps): update dependency postcss-preset-env to v9.5.15 (#30878)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 8142c7aa3eb2e0705c32e862fd7db000b898bc38
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jul 1 10:21:15 2024 +0200

    chore(deps): update definitelytyped types (non-major) (#30882)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 6d6064d2c0242c6b923b79db05fefa3d8c581827
Author: Aria <[email protected]>
Date:   Sun Jun 30 22:27:38 2024 +0200

    fix(collapsing): fix and simplify post collapsing CSS (#2757)

commit a396985c140961b2c9834102d4a63308a0ea27b5
Merge: 1eb69c5c65 935b955b15
Author: Claire <[email protected]>
Date:   Sun Jun 30 22:25:48 2024 +0200

    Merge pull request #2760 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 5d4dbbcc67c98007d417cbe67b5a2261889304dc

commit 935b955b156f6313e1a4555dbb7b0661c2de1e0a
Author: Claire <[email protected]>
Date:   Sun Jun 30 21:48:30 2024 +0200

    Temporarily disable hover cards

commit 412e5ddcbf50a5866b368623726d76e52e0102d0
Author: Eugen Rochko <[email protected]>
Date:   Fri Jun 28 00:01:40 2024 +0200

    [Glitch] Fix follow button in hover cards not working when signed out in web UI

    Port ea6c455e81f9f01a64adf123d0a4f820c6e67f97 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 98185247b85cb2fa6b0dc9c5f5be7d22f3db7a24
Author: Eugen Rochko <[email protected]>
Date:   Wed Jun 26 21:33:38 2024 +0200

    [Glitch] Add hover cards in web UI

    Port e89317d4c1da991b728b6d4a21671ed33f057cc4

    Co-authored-by: Renaud Chaput <[email protected]>
    Signed-off-by: Claire <[email protected]>

commit 4179f5fcf32a2aaa83c1eb564f60196722825669
Author: Eugen Rochko <[email protected]>
Date:   Thu Jun 27 15:17:18 2024 +0200

    [Glitch] Change `author_account` to be `authors` in REST API

    Port 096057b845f27fd6090915b22c8688a6eeb22e28 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit d612daee97d95c67009f7e6e3be25f1a2a5aa352
Author: Eugen Rochko <[email protected]>
Date:   Wed Jun 26 21:46:28 2024 +0200

    [Glitch] Convert `<ColumnHeader>` to Typescript

    Port 3939352e92f4be13b773ee243bbb6ad54d6b5bd1 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 8160a655a528856f87b8d0174bce54c78a7af4be
Author: Renaud Chaput <[email protected]>
Date:   Wed Jun 26 20:04:50 2024 +0200

    [Glitch] Convert `<Directory>` to Typescript / function component

    Port 863c470a2bc4e13a5b8df4d66a1322f4b84e2db2 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 1ac4e64a3ba51360dfc62f63e95c157a36c65e61
Author: Renaud Chaput <[email protected]>
Date:   Tue Jun 25 23:57:22 2024 +0200

    [Glitch] Change light mode to apply CSS variables to the body

    Port 8c0ff6498e090a2919e8f8104339796ed2d3d212 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit d2aea85e6c945c98193f495c7308ddda5bffa75d
Merge: 1eb69c5c65 5d4dbbcc67
Author: Claire <[email protected]>
Date:   Sun Jun 30 11:25:40 2024 +0200

    Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream

commit 5d4dbbcc67c98007d417cbe67b5a2261889304dc
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Sat Jun 29 22:51:46 2024 +0200

    chore(deps): update dependency charlock_holmes to v0.7.8 (#30870)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit ba6a558a7088b811b63a90d20b82069eee7dfaa1
Author: Claire <[email protected]>
Date:   Sat Jun 29 00:41:27 2024 +0200

    Simplify color extraction code using `bandunfold` (#30869)

commit 1bccba14082f380232a363d036b6b2e92104ffc6
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jun 28 13:39:32 2024 +0200

    chore(deps): update dependency @testing-library/react to v16 (#30533)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Renaud Chaput <[email protected]>

commit a5134f2695659ccb1c40b28b1f691e2dc932a5fb
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Jun 28 10:33:57 2024 +0200

    New Crowdin Translations (automated) (#30867)

    Co-authored-by: GitHub Actions <[email protected]>

commit ea6c455e81f9f01a64adf123d0a4f820c6e67f97
Author: Eugen Rochko <[email protected]>
Date:   Fri Jun 28 00:01:40 2024 +0200

    Fix follow button in hover cards not working when signed out in web UI (#30864)

commit 0f3fef6fda5819824457b9c1cdc41cb3d5ca976e
Author: Eugen Rochko <[email protected]>
Date:   Thu Jun 27 23:34:34 2024 +0200

    Change search modifiers to be case-insensitive (#30865)

commit 3225954865c49ce7a336b73b2bc0c5ff2b707746
Author: Michael Stanclift <[email protected]>
Date:   Thu Jun 27 11:46:20 2024 -0500

    Fix browser window color on light theme (#30861)

commit bc3737f0c3c4cc0af500413db53fb5443ad02b69
Author: Matt Jankowski <[email protected]>
Date:   Thu Jun 27 12:27:42 2024 -0400

    Add detail about running version on vips error failure (#30858)

commit 03bbb74b0ccc5f56bb3856efb1892ae8e0872a38
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Jun 27 16:27:32 2024 +0000

    fix(deps): update dependency prom-client to v15.1.3 (#30852)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 836c0477ac63ea61b955bfb900cf52ec29554e40
Author: Matt Jankowski <[email protected]>
Date:   Thu Jun 27 12:03:26 2024 -0400

    Use vips setting instead of env var in media processing spec (#30859)

commit b15a3614dc7466e983e1394a12a16874a812e672
Author: Claire <[email protected]>
Date:   Thu Jun 27 17:25:27 2024 +0200

    Stub `Vips::Error` when not using libvips (#30857)

commit ff08d99d4dceebd720e16e4a40118cbd6941b0ca
Author: David Roetzel <[email protected]>
Date:   Thu Jun 27 16:41:03 2024 +0200

    Catch encoding errors when creating link previews. (#30853)

commit 42adb6eaee3250e3557403ce52513e3d31b3ab80
Author: David Roetzel <[email protected]>
Date:   Thu Jun 27 16:40:19 2024 +0200

    Add size limit for link preview URLs (#30854)

commit 096057b845f27fd6090915b22c8688a6eeb22e28
Author: Eugen Rochko <[email protected]>
Date:   Thu Jun 27 15:17:18 2024 +0200

    Change `author_account` to be `authors` in REST API (#30846)

commit 6d1c1fd684d0f20691cba552b209b15d0107dfe4
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Jun 27 10:00:04 2024 +0200

    New Crowdin Translations (automated) (#30851)

    Co-authored-by: GitHub Actions <[email protected]>

commit f6390c3326b016e1a52057573839a5608ba317ea
Author: Matt Jankowski <[email protected]>
Date:   Thu Jun 27 03:42:57 2024 -0400

    Use flatware to parallelize CI specs (#30284)

commit ad53b0ab65cd9eba6d3078a3980c467428e79371
Author: Matt Jankowski <[email protected]>
Date:   Thu Jun 27 03:16:59 2024 -0400

    Rely on built-in ruby private IP detection (#30848)

commit 3939352e92f4be13b773ee243bbb6ad54d6b5bd1
Author: Eugen Rochko <[email protected]>
Date:   Wed Jun 26 21:46:28 2024 +0200

    Convert `<ColumnHeader>` to Typescript (#30849)

commit e89317d4c1da991b728b6d4a21671ed33f057cc4
Author: Eugen Rochko <[email protected]>
Date:   Wed Jun 26 21:33:38 2024 +0200

    Add hover cards in web UI (#30754)

    Co-authored-by: Renaud Chaput <[email protected]>

commit 863c470a2bc4e13a5b8df4d66a1322f4b84e2db2
Author: Renaud Chaput <…
  • Loading branch information
@ciao1092
ciao1092 committed Jul 25, 2024
1 parent 15e18ba commit 30113c8
Show file tree
Hide file tree
Showing 1,677 changed files with 43,533 additions and 16,396 deletions.
6 changes: 0 additions & 6 deletions .bundler-audit.yml
View file

This file was deleted.

27 changes: 11 additions & 16 deletions .devcontainer/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
# For details, see https://github.com/devcontainers/images/tree/main/src/ruby
FROM mcr.microsoft.com/devcontainers/ruby:1-3.2-bullseye
FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bookworm

# Install Rails
# RUN gem install rails webdrivers
# Install node version from .nvmrc
WORKDIR /app
COPY .nvmrc .
RUN /bin/bash --login -i -c "nvm install"

ARG NODE_VERSION="20"
RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"
# Install additional OS packages
RUN apt-get update && \
export DEBIAN_FRONTEND=noninteractive && \
apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libvips42 libpam-dev

# [Optional] Uncomment this section to install additional OS packages.
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libpam-dev

# [Optional] Uncomment this line to install additional gems.
RUN gem install foreman

# [Optional] Uncomment this line to install global node packages.
RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && corepack enable" 2>&1

COPY welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
# Move welcome message to where VS Code expects it
COPY .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
6 changes: 4 additions & 2 deletions .devcontainer/codespaces/devcontainer.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Mastodon on GitHub Codespaces",
"dockerComposeFile": "../docker-compose.yml",
"dockerComposeFile": "../compose.yaml",
"service": "app",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",

Expand All @@ -23,6 +23,8 @@
}
},

"remoteUser": "root",

"otherPortsAttributes": {
"onAutoForward": "silent"
},
Expand All @@ -37,7 +39,7 @@
},

"onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
"postCreateCommand": ".devcontainer/post-create.sh",
"postCreateCommand": "bin/setup",
"waitFor": "postCreateCommand",

"customizations": {
Expand Down
11 changes: 5 additions & 6 deletions .devcontainer/docker-compose.yml → .devcontainer/compose.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
version: '3'

services:
app:
working_dir: /workspaces/mastodon/
build:
context: .
dockerfile: Dockerfile
context: ..
dockerfile: .devcontainer/Dockerfile
volumes:
- ../..:/workspaces:cached
- ..:/workspaces/mastodon:cached
environment:
RAILS_ENV: development
NODE_ENV: development
Expand Down Expand Up @@ -70,7 +69,7 @@ services:
hard: -1

libretranslate:
image: libretranslate/libretranslate:v1.5.6
image: libretranslate/libretranslate:v1.5.7
restart: unless-stopped
volumes:
- lt-data:/home/libretranslate/.local
Expand Down
6 changes: 4 additions & 2 deletions .devcontainer/devcontainer.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Mastodon on local machine",
"dockerComposeFile": "docker-compose.yml",
"dockerComposeFile": "compose.yaml",
"service": "app",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",

Expand All @@ -23,12 +23,14 @@
}
},

"remoteUser": "root",

"otherPortsAttributes": {
"onAutoForward": "silent"
},

"onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
"postCreateCommand": ".devcontainer/post-create.sh",
"postCreateCommand": "bin/setup",
"waitFor": "postCreateCommand",

"customizations": {
Expand Down
27 changes: 0 additions & 27 deletions .devcontainer/post-create.sh
View file

This file was deleted.

9 changes: 4 additions & 5 deletions .devcontainer/welcome-message.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
👋 Welcome to "Mastodon" in GitHub Codespaces!
👋 Welcome to your Mastodon Dev Container!

🛠️ Your environment is fully setup with all the required software.
🛠️ Your environment is fully setup with all the required software.

🔍 To explore VS Code to its fullest, search using the Command Palette (Cmd/Ctrl + Shift + P or F1).

📝 Edit away, run your app as usual, and we'll automatically make it available for you to access.
💥 Run `bin/dev` to start the application processes.

🥼 Run `RAILS_ENV=test bin/rails assets:precompile && RAILS_ENV=test bin/rspec` to run the test suite.
4 changes: 4 additions & 0 deletions .env.development
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Required by ActiveRecord encryption feature
ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=fkSxKD2bF396kdQbrP1EJ7WbU7ZgNokR
ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=r0hvVmzBVsjxC7AMlwhOzmtc36ZCOS1E
ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=PhdFyyfy5xJ7WVd2lWBpcPScRQHzRTNr
6 changes: 3 additions & 3 deletions .env.production.sample
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This is a sample configuration file. You can generate your configuration
# with the `rake mastodon:setup` interactive setup wizard, but to customize
# with the `bundle exec rails mastodon:setup` interactive setup wizard, but to customize
# your setup even further, you'll need to edit it manually. This sample does
# not demonstrate all available configuration options. Please look at
# https://docs.joinmastodon.org/admin/config/ for the full documentation.
Expand Down Expand Up @@ -68,15 +68,15 @@ DB_PORT=5432

# Secrets
# -------
# Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web bundle exec rake secret` if you use docker compose)
# Generate each with the `RAILS_ENV=production bundle exec rails secret` task (`docker-compose run --rm web bundle exec rails secret` if you use docker compose)
# -------
SECRET_KEY_BASE=
OTP_SECRET=


# Web Push
# --------
# Generate with `rake mastodon:webpush:generate_vapid_key` (first is the private key, second is the public one)
# Generate with `bundle exec rails mastodon:webpush:generate_vapid_key` (first is the private key, second is the public one)
# You should only generate this once per instance. If you later decide to change it, all push subscription will
# be invalidated, requiring the users to access the website again to resubscribe.
# --------
Expand Down
6 changes: 6 additions & 0 deletions .env.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ NODE_ENV=production
# Federation
LOCAL_DOMAIN=cb6e6126.ngrok.io
LOCAL_HTTPS=true

# Secret values required by ActiveRecord encryption feature
# Use `bin/rails db:encryption:init` to generate fresh secrets
ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=test_determinist_key_DO_NOT_USE_IN_PRODUCTION
ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=test_salt_DO_NOT_USE_IN_PRODUCTION
ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=test_primary_key_DO_NOT_USE_IN_PRODUCTION
31 changes: 5 additions & 26 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ module.exports = defineConfig({
es6: true,
},

globals: {
ATTACHMENT_HOST: false,
},

parser: '@typescript-eslint/parser',

plugins: [
Expand Down Expand Up @@ -79,7 +75,7 @@ module.exports = defineConfig({
],
},
],
'no-empty': 'off',
'no-empty': ['error', { "allowEmptyCatch": true }],
'no-restricted-properties': [
'error',
{ property: 'substring', message: 'Use .slice instead of .substring.' },
Expand All @@ -94,7 +90,6 @@ module.exports = defineConfig({
message: "Use '·' (middle dot) instead of '•' (bullet)",
},
],
'no-self-assign': 'off',
'no-unused-expressions': 'error',
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': [
Expand All @@ -119,12 +114,10 @@ module.exports = defineConfig({
'react/jsx-tag-spacing': 'error',
'react/jsx-uses-react': 'off', // not needed with new JSX transform
'react/jsx-wrap-multilines': 'error',
'react/no-deprecated': 'off',
'react/react-in-jsx-scope': 'off', // not needed with new JSX transform
'react/self-closing-comp': 'error',

// recommended values found in https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/v6.8.0/src/index.js#L46
'jsx-a11y/accessible-emoji': 'warn',
'jsx-a11y/click-events-have-key-events': 'off',
'jsx-a11y/label-has-associated-control': 'off',
'jsx-a11y/media-has-caption': 'off',
Expand All @@ -139,23 +132,6 @@ module.exports = defineConfig({
// ],
'jsx-a11y/no-interactive-element-to-noninteractive-role': 'off',
// recommended rule is:
// 'jsx-a11y/no-noninteractive-element-interactions': [
// 'error',
// {
// body: ['onError', 'onLoad'],
// iframe: ['onError', 'onLoad'],
// img: ['onError', 'onLoad'],
// },
// ],
'jsx-a11y/no-noninteractive-element-interactions': [
'warn',
{
handlers: [
'onClick',
],
},
],
// recommended rule is:
// 'jsx-a11y/no-noninteractive-tabindex': [
// 'error',
// {
Expand All @@ -165,7 +141,6 @@ module.exports = defineConfig({
// },
// ],
'jsx-a11y/no-noninteractive-tabindex': 'off',
'jsx-a11y/no-onchange': 'off',
// recommended is full 'error'
'jsx-a11y/no-static-element-interactions': [
'warn',
Expand Down Expand Up @@ -366,6 +341,9 @@ module.exports = defineConfig({
// Disable formatting rules that have been enabled in the base config
'indent': 'off',

// This is not needed as we use noImplicitReturns, which handles this in addition to understanding types
'consistent-return': 'off',

'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],

'@typescript-eslint/consistent-type-definitions': ['warn', 'interface'],
Expand All @@ -380,6 +358,7 @@ module.exports = defineConfig({
"message": "Use typed hooks `useAppDispatch` and `useAppSelector` instead."
}
],
"@typescript-eslint/restrict-template-expressions": ['warn', { allowNumber: true }],
'jsdoc/require-jsdoc': 'off',

// Those rules set stricter rules for TS files
Expand Down
23 changes: 23 additions & 0 deletions .github/actions/setup-ruby/action.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: 'Setup RUby'
description: 'Setup a Ruby environment ready to run the Mastodon code'
inputs:
ruby-version:
description: The Ruby version to install
default: '.ruby-version'
additional-system-dependencies:
description: 'Additional packages to install'

runs:
using: 'composite'
steps:
- name: Install system dependencies
shell: bash
run: |
sudo apt-get update
sudo apt-get install -y libicu-dev libidn11-dev libvips42 ${{ inputs.additional-system-dependencies }}
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ inputs.ruby-version }}
bundler-cache: true
4 changes: 2 additions & 2 deletions .github/codecov.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ coverage:
status:
project:
default:
# Github status check is not blocking
# GitHub status check is not blocking
informational: true
patch:
default:
# Github status check is not blocking
# GitHub status check is not blocking
informational: true
Loading

0 comments on commit 30113c8

Please sign in to comment.