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.

Sign up for GitHub

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

Jump to bottom

Merge latest upstream changes from glitch-soc/main #72

Merged
merged 10 commits into from
Jul 7, 2023
Merged

Merge latest upstream changes from glitch-soc/main #72

merged 10 commits into from
Jul 7, 2023

Commits on Jul 7, 2023

  1. Fix incorrect secondary button size (#2276)

    @ClearlyClaire
    ClearlyClaire committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    513078d View commit details
    Browse the repository at this point in the history

  2. Fix processing of media files with unusual names (mastodon#25788)

    @ClearlyClaire
    ClearlyClaire committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    94fbac7 View commit details
    Browse the repository at this point in the history

  3. Update dependency sanitize to v6.0.2 [SECURITY] (mastodon#25777) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    8b62455 View commit details
    Browse the repository at this point in the history

  4. Fix typo in CHANGELOG.md (mastodon#25764)

    @nemobis
    nemobis committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    dfedf0e View commit details
    Browse the repository at this point in the history

  5. Fix branding:generate_app_icons failing because of disallowed ICO cod… 

    …er (mastodon#25794)
    @ClearlyClaire
    ClearlyClaire committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    71d4494 View commit details
    Browse the repository at this point in the history

  6. Fix crash in admin interface when viewing a remote user with verified… 

    … links (mastodon#25796)
    @ClearlyClaire
    ClearlyClaire committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    b6d173b View commit details
    Browse the repository at this point in the history

  7. Tag images with the latest tag only when running against the latest s… 

    …table branch (mastodon#25803)
    @renchap
    renchap committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    d481e72 View commit details
    Browse the repository at this point in the history

  8. Bump version to v4.1.4 (mastodon#25805)

    @ClearlyClaire
    ClearlyClaire committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    0051128 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into glitch-soc/merge-upstream 

    Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream attempted something with tags.
  Kept our version.
    @ClearlyClaire
    ClearlyClaire committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    b9aa228 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #2279 from ClearlyClaire/glitch-soc/merge-upstream 

    Merge upstream changes
    @ClearlyClaire
    ClearlyClaire committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    a40529f View commit details
    Browse the repository at this point in the history