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 upstream changes up to 58ace2e45e16a69977267d03874568c11043f04c #2747

Merged
merged 11 commits into from
Jun 18, 2024
Merged

Merge upstream changes up to 58ace2e45e16a69977267d03874568c11043f04c #2747

merged 11 commits into from
Jun 18, 2024

Commits on Jun 18, 2024

  1. Remove unused Extractor#extract_cashtags_with_indices method (masto… 

    …don#30742)
    @mjankowski
    mjankowski authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    38c6825 View commit details
    Browse the repository at this point in the history

  2. Remove already configured excludes from .rubocop.yml (mastodon#30741)

    @mjankowski
    mjankowski authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    238dd23 View commit details
    Browse the repository at this point in the history

  3. Remove comment for ruby-core-extracted gem (mastodon#30740)

    @mjankowski
    mjankowski authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    7db3509 View commit details
    Browse the repository at this point in the history

  4. fix(deps): update dependency sass to v1.77.6 (mastodon#30745) 

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

  5. chore(deps): update docker/dockerfile docker tag to v1.8 (mastodon#30736 

    )

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

  6. New Crowdin Translations (automated) (mastodon#30746) 

    Co-authored-by: GitHub Actions <[email protected]>
    @github-actions @web-flow
    github-actions[bot] and web-flow authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    50db95b View commit details
    Browse the repository at this point in the history

  7. Convert notifications policies frontend code to Typescript (mastodon#… 

    …29868)
    @renchap
    renchap authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    d558dfd View commit details
    Browse the repository at this point in the history

  8. Build ffmpeg from source in Dockerfile (mastodon#30569)

    @vmstan
    vmstan authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    d97fcd0 View commit details
    Browse the repository at this point in the history

  9. Fix SQL error in admin measures API (mastodon#30753)

    @ClearlyClaire
    ClearlyClaire authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    58ace2e View commit details
    Browse the repository at this point in the history

  10. Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-s… 

    …oc/merge-upstream
    @ClearlyClaire
    ClearlyClaire committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    b0c979a View commit details
    Browse the repository at this point in the history

  11. [Glitch] Convert notifications policies frontend code to Typescript 

    Port d558dfd to glitch-soc

Signed-off-by: Claire <[email protected]>
    @renchap @ClearlyClaire
    renchap authored and ClearlyClaire committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    af0a1a8 View commit details
    Browse the repository at this point in the history