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 9cc4040308a758d4b77961f4da79cf63a044fffe #2740

Merged
merged 22 commits into from
Jun 11, 2024
Merged

Merge upstream changes up to 9cc4040308a758d4b77961f4da79cf63a044fffe #2740

merged 22 commits into from
Jun 11, 2024

Conversation

ClearlyClaire
Copy link

No conflicts, nor anything to port.

mjankowski and others added 22 commits June 7, 2024 20:18
@mjankowski
Doc updates for Docker/devcontainers/codespace (mastodon#30582)
521b433
@mjankowski @igordsmelo
Case correction Github -> GitHub (mastodon#30446)
c1a84f1 
Co-authored-by: Igor <[email protected]>
@mjankowski
Install from nvmrc during devcontainer Dockerfile build (mastodon#30603)
6952af1
@mjankowski
Fix Capybara/NegationMatcher cop in spec/system (mastodon#30616)
827e36f
@mjankowski @ClearlyClaire
Opt in to remaining Rails 7.1 defaults (mastodon#30332)
0cf9121 
Co-authored-by: Claire <[email protected]>
@danielmbrasil
fix: Return HTTP 422 when scheduled status time is less than 5 minutes (
77c2216 
mastodon#30584)
@renovate
chore(deps): update dependency concurrent-ruby to v1.3.3 (mastodon#30605
801f9fe 
)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency httplog to '~> 1.7.0' (mastodon#30613)
bfd674d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency oj to v3.16.4 (mastodon#30620)
2dca6ec 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency @types/lodash to v4.17.5 (mastodon#30627)
4528724 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update devdependencies (non-major) (mastodon#30628)
dd4a976 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency uuid to v10 (mastodon#30624)
a6e0e16 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency rubocop-capybara to v2.21.0 (mastodon#…
589365b 
…30611)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30608)
bb27321 
Co-authored-by: GitHub Actions <[email protected]>
@ykzts
Add customManagers:dockerfileVersions to renovate.json5 (mastodon#3…
f0f144e 
…0607)
@danielmbrasil
Add Specs for Scheduled Status Model Validations (mastodon#30585)
28f9a8f
@mjankowski
Reference constants from account validation specs (mastodon#30634)
92b3004
@mjankowski
Match report validation spec to extracted constant (mastodon#30633)
3e3f3d7
@mjankowski
Update macOS local dev setup instructions (mastodon#30641)
28921a1
@mjankowski
Extract TEXT_LENGTH_LIMIT constant in Appeal class (mastodon#30638)
9bf2e2e
@mjankowski
Extract COMMENT_SIZE_LIMIT constant in AP::Activity::Flag class (m…
9cc4040 
…astodon#30637)
@ClearlyClaire
Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-s…
be68f8f 
…oc/merge-upstream
@ClearlyClaire ClearlyClaire marked this pull request as ready for review June 10, 2024 17:03
@ClearlyClaire ClearlyClaire merged commit 6922536 into glitch-soc:main Jun 11, 2024
41 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 @danielmbrasil @ykzts