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 e38ce3beb7b83f43ef6e6f144c19b186c393910c #2826

Merged
merged 25 commits into from
Aug 26, 2024
Merged

Merge upstream changes up to e38ce3beb7b83f43ef6e6f144c19b186c393910c #2826

merged 25 commits into from
Aug 26, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Aug 26, 2024 •
edited
Loading

Ported changes

Additional changes

ClearlyClaire and others added 25 commits August 26, 2024 07:21
@ClearlyClaire
Update dependency rexml (mastodon#31590)
3bfa5ff
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31572)
626d44b 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update devDependencies (non-major) (mastodon#31587)
a6906e0 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @types/react to v18.3.4 (mastodon#31586)
5bcfe8d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix Rails/RootPathnameMethods cop (mastodon#31582)
bcc4b10
@mjankowski
Fix Rails/CompactBlank cop (mastodon#31581)
a6df125
@renovate
Update dependency jsdom to v24.1.3 (mastodon#31577)
4cc589e 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renchap
Update omniauth-rails_csrf_protection (mastodon#31552)
f9f4006
@ThisIsMissEm
Streaming: Refactor to use metrics.$name instead of destructuring (ma…
c245a20 
…stodon#31566)
@renovate
Update dependency axios to v1.7.5 (mastodon#31564)
0422a5c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency test-prof to v1.4.1 (mastodon#31561)
d0822a0 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency bundler-audit to v0.9.2 (mastodon#31558)
ccc0aea 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency brakeman to v6.2.1 (mastodon#31553)
3e1bd97 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Fix typo in changelog (mastodon#31591)
a3c33c7
@renovate
Update Yarn to v4.4.1 (mastodon#31575)
e3516fa 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Convert health check endpoint controller spec to request spec (mastod…
641ae6a 
…on#31565)
@mjankowski
Convert "custom css" controller spec to request spec (mastodon#31595)
36ccdcc
@mjankowski
Convert manifest controller spec to request spec (mastodon#31596)
5172d84
@mjankowski @ClearlyClaire
Convert emojis controller spec to request spec (mastodon#31597)
dbe0ee8 
Co-authored-by: Claire <[email protected]>
@mjankowski
Cache asset compilation results on CI (mastodon#30868)
963c130
@mjankowski
Convert "static page" controller specs to system specs (mastodon#31599)
4c2534d
@ClearlyClaire
Fix spurious loading bar middleware usage (mastodon#31592)
e38ce3b
@ClearlyClaire
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-s…
11b8017 
…oc/merge-upstream
@ClearlyClaire
[Glitch] Fix spurious loading bar middleware usage
2379bfe 
Port e38ce3b to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
Fix tests for glitch-soc
8f678a3
@ClearlyClaire ClearlyClaire marked this pull request as ready for review August 26, 2024 18:03
@ClearlyClaire ClearlyClaire merged commit 11014ac into glitch-soc:main Aug 26, 2024
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ClearlyClaire @mjankowski @renchap @ThisIsMissEm