Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream - 4.3.0.alpha5 #65

Merged
merged 477 commits into from
Sep 23, 2024
Merged

Merge upstream - 4.3.0.alpha5 #65

merged 477 commits into from
Sep 23, 2024
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Sep 4, 2024

  1. Configuration menu
    Copy the full SHA
    f1003b2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9ed1aab View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    14af5b4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a24049d View commit details
    Browse the repository at this point in the history
  5. Update dependency sass to v1.78.0 (mastodon#31739)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    612802b View commit details
    Browse the repository at this point in the history
  6. Update dependency aws-sdk-s3 to v1.160.0 (mastodon#31735)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    3553d6c View commit details
    Browse the repository at this point in the history
  7. Update dependency test-prof to v1.4.2 (mastodon#31733)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    2c6131c View commit details
    Browse the repository at this point in the history
  8. Update dependency ruby to v3.3.5 (mastodon#31719)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    393a550 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    1c17dca View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    58df00f View commit details
    Browse the repository at this point in the history
  11. Update dependency shoulda-matchers to v6.4.0 (mastodon#31731)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    ffe29ce View commit details
    Browse the repository at this point in the history
  12. Update eslint (non-major) (mastodon#31684)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    d8bd9ef View commit details
    Browse the repository at this point in the history
  13. Update dependency pino to v9.4.0 (mastodon#31720)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    44fd080 View commit details
    Browse the repository at this point in the history
  14. Update dependency pino-http to v10.3.0 (mastodon#31721)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    7fb8834 View commit details
    Browse the repository at this point in the history
  15. Update dependency postcss to v8.4.45 (mastodon#31742)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    36710ae View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    ee55d20 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    1fcffa5 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    fab29eb View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    585e369 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    9ba81ea View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    ef2bc8e View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    fe04291 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    e1b5f3f View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    559958f View commit details
    Browse the repository at this point in the history
  25. Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-s…

    …oc/merge-upstream
    
    Conflicts:
    - `spec/lib/sanitize/config_spec.rb`:
      Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
      glitch-soc had differences in the first few tests because of the wider
      subset of HTML it accepts.
      Changed `describe` to `RSpec.describe` as upstream did, keeping
      glitch-soc's tests.
    ClearlyClaire committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    5a55180 View commit details
    Browse the repository at this point in the history
  26. [Glitch] Fix all notification types being stored without filtering wh…

    …en polling
    
    Port fab29eb to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    ClearlyClaire committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    1d86377 View commit details
    Browse the repository at this point in the history
  27. [Glitch] Fix display name being displayed instead of domain in remote…

    … reports
    
    Port 585e369 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    ClearlyClaire committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    1fb31ad View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    cb1eaa1 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    4678473 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    4d5c91e View commit details
    Browse the repository at this point in the history
  31. Merge pull request glitch-soc#2835 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to fe04291
    ClearlyClaire authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    5a1d7db View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Configuration menu
    Copy the full SHA
    7d91723 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ec4c490 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    eb23d9f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b265a65 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ba9fd1c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f9712fa View commit details
    Browse the repository at this point in the history
  7. Update dependency cssnano to v7.0.6 (mastodon#31757)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    bd8cd0c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8fd3e37 View commit details
    Browse the repository at this point in the history
  9. Update docker.io/ruby Docker tag to v3.3.5 (mastodon#31758)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    5b1ae15 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    e820cc3 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    b4b639e View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    f85694a View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    d58faa2 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    850478d View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    bc435c6 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    5acec08 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    1a0ef0c View commit details
    Browse the repository at this point in the history
  18. [Glitch] Change design of unread conversations in web UI

    Port ec4c490 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    cb324b5 View commit details
    Browse the repository at this point in the history
  19. [Glitch] Fix radio checkbox visibility in Report dialogs

    Port b4b639e to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    vmstan authored and ClearlyClaire committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    db6b1fe View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    09017dd View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    7efe0bd View commit details
    Browse the repository at this point in the history
  22. Merge pull request glitch-soc#2836 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to 5acec08
    ClearlyClaire authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    4cd7458 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Update dependency tzinfo-data to v1.2024.2 (mastodon#31780)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    60182db View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cc48651 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    be77a10 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6b6a80b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ebf0932 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1fed11c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    fd7fc7b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a9d0b48 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c88ba52 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    b530fc5 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    4f81ad2 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    0a433d0 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    7335a43 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    b716248 View commit details
    Browse the repository at this point in the history
  15. Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-s…

    …oc/merge-upstream
    
    Conflicts:
    - `app/helpers/application_helper.rb`:
      Upstream reworked how CSS classes for the document's body are computed.
      Slight conflict due to glitch-soc's different theming system.
      Updated as upstream did.
    ClearlyClaire committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    2912499 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    af6ca96 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    5c97ccf View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Merge pull request glitch-soc#2837 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to b716248
    ClearlyClaire authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    9dcc680 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Configuration menu
    Copy the full SHA
    10143d0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    afa2e25 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    82161d8 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Configuration menu
    Copy the full SHA
    c6a0768 View commit details
    Browse the repository at this point in the history
  2. Update dependency pg to v1.5.8 (mastodon#31795)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    1f13b87 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e6969cf View commit details
    Browse the repository at this point in the history
  4. Update peter-evans/create-pull-request action to v7 (mastodon#31818)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    9d9901c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a0ea2fa View commit details
    Browse the repository at this point in the history
  6. Update dependency postcss-preset-env to v10.0.3 (mastodon#31821)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    1d03570 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2caa3f3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a021dee View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    441af26 View commit details
    Browse the repository at this point in the history
  10. Merge pull request glitch-soc#2839 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to 2caa3f3
    ClearlyClaire authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    1436db3 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    d0ab94c View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    592a7af View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Update dependency oj to v3.16.6 (mastodon#31831)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    9ea710e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5b99514 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5260233 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3929e3c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e0c27a5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    da07adf View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c4b09d6 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4ffaced View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    0c3c06f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    e09f9f8 View commit details
    Browse the repository at this point in the history
  11. Update dependency express to v4.20.0 (mastodon#31836)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    e6f5b36 View commit details
    Browse the repository at this point in the history
  12. Update dependency propshaft to v1 (mastodon#31832)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    9e12fa2 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Configuration menu
    Copy the full SHA
    a3215c0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cee71b9 View commit details
    Browse the repository at this point in the history
  3. Update dependency aws-sdk-s3 to v1.161.0 (mastodon#31853)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    9769ffd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cdcd834 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2babfaf View commit details
    Browse the repository at this point in the history
  6. Update typescript-eslint monorepo to v8 (major) (mastodon#31231)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Renaud Chaput <[email protected]>
    renovate[bot] and renchap authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    a27f7f4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b240bad View commit details
    Browse the repository at this point in the history
  8. [Glitch] Change labels on thread indicators in web UI

    Partial port of a021dee to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    e2c101e View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Merge pull request glitch-soc#2841 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to a021dee
    ClearlyClaire authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    7cfa8bb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7d53ca5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f2a92c2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3d46f47 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    10e2b87 View commit details
    Browse the repository at this point in the history
  6. [Glitch] Change design of hide media button in web UI

    Port 3929e3c to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    abe1717 View commit details
    Browse the repository at this point in the history
  7. [Glitch] Add ability to manage which websites can credit you in link …

    …previews
    
    Port CSS changes from e0c27a5 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    77cbe23 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ab763c4 View commit details
    Browse the repository at this point in the history
  9. Merge pull request glitch-soc#2842 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to 0c3c06f
    ClearlyClaire authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    cb91629 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    24ef825 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    c35ea59 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    5f782f9 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    a496aea View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    17c57c4 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    8cdc148 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    4aa6003 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    f3c4874 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    1b6a82b View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    207c073 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    a269ff9 View commit details
    Browse the repository at this point in the history
  21. Update dependency aws-sdk-s3 to v1.162.0 (mastodon#31875)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    cc3cf9c View commit details
    Browse the repository at this point in the history
  22. Update dependency express to v4.21.0 (mastodon#31877)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    0226bbe View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    90d7a4b View commit details
    Browse the repository at this point in the history
  24. [Glitch] Fix alt text modal styling

    Port e09f9f8 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    vmstan authored and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    eb28472 View commit details
    Browse the repository at this point in the history
  25. [Glitch] Change inner borders in media galleries in web UI

    Port a3215c0 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    196b141 View commit details
    Browse the repository at this point in the history
  26. [Glitch] Update typescript-eslint monorepo to v8 (major)

    Port a27f7f4 to glitch-soc
    
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Renaud Chaput <[email protected]>
    Signed-off-by: Claire <[email protected]>
    2 people authored and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    17e3a12 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    caaa412 View commit details
    Browse the repository at this point in the history
  28. [Glitch] Fix notifications re-rendering spuriously in web UI

    Port f2a92c2 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    2d31cdb View commit details
    Browse the repository at this point in the history
  29. Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-s…

    …oc/merge-upstream
    
    Conflicts:
    - `app/helpers/accounts_helper.rb`:
      Upstream removed a helper, textually adjacent to a glitch-soc-only one.
      Not really a conflict.
      Removed the helper as upstream did.
    - `app/views/layouts/embedded.html.haml`:
      Conflicts due to theming system.
      Adapted upstream's change to our theming system.
    - `app/views/statuses/_simple_status.html.haml`:
      Removed upstream, but we had local changes.
      Removed as upstream did.
    ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    3465d39 View commit details
    Browse the repository at this point in the history
  30. [Glitch] Change embedded posts to use web UI

    Port 3d46f47 to glitch-soc
    
    Co-authored-by: Claire <[email protected]>
    Signed-off-by: Claire <[email protected]>
    Gargron and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    e705ec1 View commit details
    Browse the repository at this point in the history
  31. [Glitch] Change design of embed modal in web UI

    Port 24ef825 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    bd68d2a View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    83b553c View commit details
    Browse the repository at this point in the history
  33. [Glitch] Autofocus primary button in modals

    Port 5f782f9 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    afd3953 View commit details
    Browse the repository at this point in the history
  34. [Glitch] Fix review history and action modal styling

    Port a269ff9 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    vmstan authored and ClearlyClaire committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    9b1ecf7 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    2020775 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    4050beb View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    427ed60 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Configuration menu
    Copy the full SHA
    353ade7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    49cbee3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a2c4f5f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ba81e4e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c1b2c4f View commit details
    Browse the repository at this point in the history
  6. Update dependency opentelemetry-instrumentation-pg to '~> 0.29.0' (ma…

    …stodon#31897)
    
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    5ba3405 View commit details
    Browse the repository at this point in the history
  7. Merge pull request glitch-soc#2843 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to 0226bbe
    ClearlyClaire authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    065abf2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    117ac13 View commit details
    Browse the repository at this point in the history
  9. Merge pull request glitch-soc#2845 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to 5ba3405
    ClearlyClaire authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    3469191 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. Configuration menu
    Copy the full SHA
    4b40d13 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Update dependency i18n to v1.14.6 (mastodon#31925)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    0cc05fb View commit details
    Browse the repository at this point in the history
  2. Update dependency husky to v9.1.6 (mastodon#31923)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    2afaa3b View commit details
    Browse the repository at this point in the history
  3. Update DefinitelyTyped types (non-major) (mastodon#31922)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    9ea2705 View commit details
    Browse the repository at this point in the history
  4. Update dependency postcss to v8.4.47 (mastodon#31913)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    c24de04 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    822e918 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    abd2f56 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bf8b55c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    1d58f93 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    474abf3 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c54cbf7 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    d5cf27e View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    c0eda83 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    efb0e2c View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    e0648a9 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    c620452 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    6c76a7a View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    ca8e892 View commit details
    Browse the repository at this point in the history
  18. Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-s…

    …oc/merge-upstream
    
    Conflicts:
    - `app/models/custom_emoji.rb`:
      An upstream refactor touched lines adjacent to ones modified in glitch-soc.
      Ported upstream's changes.
    ClearlyClaire committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    665e912 View commit details
    Browse the repository at this point in the history
  19. [Glitch] Convert notification requests actions and reducers to Typesc…

    …ript
    
    Port c0eda83 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    ClearlyClaire committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    e25634c View commit details
    Browse the repository at this point in the history
  20. [Glitch] Fix horizontal scrollbar on who to follow carousel in web UI

    Port efb0e2c to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    b6398cf View commit details
    Browse the repository at this point in the history
  21. [Glitch] Rename /api/v2_alpha/notifications* to `/api/v2/notificati…

    …ons*`
    
    Port e0648a9 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    ClearlyClaire committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    0740352 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    43f6792 View commit details
    Browse the repository at this point in the history
  23. Merge pull request glitch-soc#2846 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to e0648a9
    ClearlyClaire authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    c8ef702 View commit details
    Browse the repository at this point in the history
  24. Merge pull request glitch-soc#2847 from ClearlyClaire/glitch-soc/fixe…

    …s/click-detailed-status
    
    Fix detailed statuses being clickable and linking to broken pages
    ClearlyClaire authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    18209d2 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Configuration menu
    Copy the full SHA
    5a33a56 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d2f9075 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6a233cb View commit details
    Browse the repository at this point in the history
  4. Merge commit from fork

    Co-authored-by: Eugen Rochko <[email protected]>
    oneiros and Gargron authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    d8f9db5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3e91c10 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6de18bb View commit details
    Browse the repository at this point in the history
  7. [Glitch] Enable grouped notifications unconditionally

    Port c620452 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    ClearlyClaire committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    11de3db View commit details
    Browse the repository at this point in the history
  8. [Glitch] Fix selectSettingsNotificationsExcludedTypes not being memoi…

    …zed properly
    
    Port ca8e892 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    ClearlyClaire committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    93b2c81 View commit details
    Browse the repository at this point in the history
  9. [Glitch] Fix background of text detection progress

    Port 5a33a56 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    vmstan authored and ClearlyClaire committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    a85b247 View commit details
    Browse the repository at this point in the history
  10. [Glitch] Increase no-gap-breakpoint by 32px to fix overflow

    Port d2f9075 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    ClearlyClaire committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    6bd86fe View commit details
    Browse the repository at this point in the history
  11. Merge pull request glitch-soc#2848 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to 3e91c10
    ClearlyClaire authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    486e616 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Update dependency babel-loader to v8.4.1 (mastodon#31931)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    f3f06da View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a397141 View commit details
    Browse the repository at this point in the history
  3. Update dependency memory_profiler to v1.1.0 (mastodon#31947)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    b7548db View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bd86c69 View commit details
    Browse the repository at this point in the history
  5. Update dependency dotenv to v3.1.4 (mastodon#31953)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    6f3d751 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9437386 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    eb16763 View commit details
    Browse the repository at this point in the history
  8. Update dependency sass to v1.79.1 (mastodon#31958)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    a791274 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7740f1a View commit details
    Browse the repository at this point in the history
  10. Update dependency pg-connection-string to v2.7.0 (mastodon#31950)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    2d399f5 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    5405bdd View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    6f836c4 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    bf8eaaa View commit details
    Browse the repository at this point in the history
  14. Update dependency pg to v8.13.0 (mastodon#31949)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    42f9f50 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    e3baa1c View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    8b70834 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    29656cb View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Configuration menu
    Copy the full SHA
    62a39d6 View commit details
    Browse the repository at this point in the history
  2. Update dependency puma to v6.4.3 (mastodon#31975)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    90db524 View commit details
    Browse the repository at this point in the history
  3. Update dependency aws-sdk-s3 to v1.163.0 (mastodon#31972)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    1fce55c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b071e61 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5d573c9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    efdc175 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    ef4d6ab View commit details
    Browse the repository at this point in the history
  8. Update dependency devise-two-factor to v6 [SECURITY] (mastodon#31957)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: David Roetzel <[email protected]>
    renovate[bot] and oneiros authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    6801afa View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    2946a92 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5a8f2fe View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    57a38f0 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    ae03e4f View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Update dependency react-select to v5.8.1 (mastodon#31982)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    09459ed View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9a03902 View commit details
    Browse the repository at this point in the history
  3. Update dependency sass to v1.79.2 (mastodon#31992)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    840fd69 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    162f9a3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c922af2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    04a939d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e7fd098 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8afa3bb View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    bdf83c3 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    a7dbf6f View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    6632606 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    171394e View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    d55f4fb View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    ed8b0e4 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    7ed9c59 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. New Crowdin Translations (automated) (glitch-soc#2773)

    * 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]>
    3 people authored Sep 21, 2024
    Configuration menu
    Copy the full SHA
    b0f6d3e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    221bba1 View commit details
    Browse the repository at this point in the history
  3. [Glitch] Mute XHR abort errors

    Port 7740f1a to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    c960657 authored and ClearlyClaire committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    0820cbc View commit details
    Browse the repository at this point in the history
  4. [Glitch] Fix the appearance of avatars when they do not load

    Port 8b70834 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    renchap authored and ClearlyClaire committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    d77348f View commit details
    Browse the repository at this point in the history
  5. [Glitch] Fix sass deprecation warning

    Port 29656cb to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    80cb285 View commit details
    Browse the repository at this point in the history
  6. [Glitch] Fix browser glitch caused by two overlapping scroll animatio…

    …ns in web UI
    
    Port ef4d6ab to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    9bd5838 View commit details
    Browse the repository at this point in the history
  7. [Glitch] Fix custom history.push and history.replace building bog…

    …us location if path is omitted
    
    Port 57a38f0 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    ClearlyClaire committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    86b9d3b View commit details
    Browse the repository at this point in the history
  8. [Glitch] Update directory page options to use URL params

    Port ae03e4f to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    renchap authored and ClearlyClaire committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    03829d8 View commit details
    Browse the repository at this point in the history
  9. [Glitch] Change zoom icon in web UI

    Port e7fd098 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    a969c6a View commit details
    Browse the repository at this point in the history
  10. Merge pull request glitch-soc#2850 from ClearlyClaire/glitch-soc/merg…

    …e-upstream
    
    Merge upstream changes up to 7ed9c59
    ClearlyClaire authored Sep 21, 2024
    Configuration menu
    Copy the full SHA
    5aebdc9 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. [Glitch] Change how content warnings and filters are displayed in web UI

    Partially apply 500f492 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    7d97e3d View commit details
    Browse the repository at this point in the history
  2. [Glitch] Fix wrong width on content warnings and filters in web UI

    Port b265a65 to glitch-soc
    
    Signed-off-by: Claire <[email protected]>
    Gargron authored and ClearlyClaire committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    0d26c9f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4d75493 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7c148ed View commit details
    Browse the repository at this point in the history
  5. Merge pull request glitch-soc#2852 from ClearlyClaire/glitch-soc/feat…

    …ures/grouped-notifications-cw
    
    Add content warning support to grouped notifications
    ClearlyClaire authored Sep 22, 2024
    Configuration menu
    Copy the full SHA
    6ac6d86 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. merge-upstream

    sneakers-the-rat committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    02d9f61 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    11942f7 View commit details
    Browse the repository at this point in the history
  3. update protobuf

    sneakers-the-rat committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    31429d4 View commit details
    Browse the repository at this point in the history