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 1e71c4e247eb8900a718b04113ffce9c1b8ad2f4 #2894

Merged
merged 50 commits into from
Nov 10, 2024
Merged

Merge upstream changes up to 1e71c4e247eb8900a718b04113ffce9c1b8ad2f4 #2894

merged 50 commits into from
Nov 10, 2024

Conversation

ClearlyClaire
Copy link

No conflicts.

Ported changes

renovate bot and others added 30 commits November 4, 2024 08:38
@renovate
Update devDependencies (non-major) (mastodon#32761)
dfdc6b2 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update DefinitelyTyped types (non-major) (mastodon#32760)
1657106 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update formatjs monorepo (mastodon#32751)
f2763d9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency oj to v3.16.7 (mastodon#32741)
5bc32c4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency utf-8-validate to v6.0.5 (mastodon#32738)
074fb04 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Update browser to version 6.0.0 (mastodon#32728)
e7a9391
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32733)
2271b39 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Reduce factory generation in AccountStatusesFilter spec (mastodon#3…
ff490da 
…2727)
@ClearlyClaire
Refactor common checks in tootctl media remove-orphans (mastodon#32720
dfccd20 
)
@mjankowski
Remove cookie rotator (mastodon#32289)
a139dac
@renovate
Update formatjs monorepo (mastodon#32764)
823f597 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@Gargron
Fix performance of percentile calculation for annual reports (mastodo…
90f4ffa 
…n#32765)
@ClearlyClaire
Fix alt-text pop-in not using the translated description (mastodon#32766
0a1b5df 
)
@renovate
Update dependency json-ld-preloaded to v3.3.1 (mastodon#32771)
c83eea9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency postcss-preset-env to v10.0.9 (mastodon#32746)
883b509 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32772)
933fa81 
Co-authored-by: GitHub Actions <[email protected]>
@oneiros
Disable httplog gem in production (mastodon#32776)
d60ef3f
@mjankowski
Remove unused usage method from REST::V1::InstanceSerializer (mas…
20a1471 
…todon#32768)
@Gargron
Add year in review feature to web UI (mastodon#32709)
d6349c0
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32782)
871e3b2 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Avoid latest featured tag use on post removal unless necessary (masto…
2bea74e 
…don#32787)
@renovate
Update dependency ruby to v3.3.6 (mastodon#32773)
e4b4d6d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update docker.io/ruby Docker tag to v3.3.6 (mastodon#32784)
e581c1a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Update faraday to version 2.12.0 (mastodon#32718)
4053cd2
@renovate
Update dependency discard to v1.4.0 (mastodon#32785)
1392daa 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Fix out-of-view post contents being inconsistent with in-view post co…
d482211 
…ntents (mastodon#32778)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32793)
4ed3ce2 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update dependency aws-sdk-s3 to v1.170.0 (mastodon#32791)
8f4af29 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Fix “uninitialized constant HttpLog” errors in tootctl (mastodon#32796)
befb44a
@mjankowski
Use with_options for shared settings options in routes (mastodon#30847
ae66762 
)
mjankowski and others added 20 commits November 7, 2024 10:28
@mjankowski
Update location of unused MIN_SCHEDULE_OFFSET constant (mastodon#31217
73f66af 
)
@mjankowski
Add Status.not_direct_visibility scope (mastodon#32065)
68b545e
@mjankowski
Use shell.indent for list output indentation in CLI area (mastodon#…
e0a44b8 
…31969)
@ClearlyClaire
Fix list of follow requests not having a back button (mastodon#32797)
6ae1fcd
@mjankowski
Add EmailDomainBlock.parents scope (mastodon#31968)
6979471
@renovate
Update dependency net-http to '~> 0.5.0' (mastodon#32794)
16b074d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Update Rails to version 7.2.2 (mastodon#30391)
41227ae
@mjankowski
Add coverage for misc serializers (mastodon#32781)
870bb06
@mjankowski
Remove postgres version support check for REINDEX in migration (mas…
f180880 
…todon#32744)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32803)
8df867b 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Match dependency-generator output for require_relative usage (masto…
4ef3a1a 
…don#32800)
@mjankowski
Use touch_all with batches (mastodon#32799)
df54196
@mjankowski
Add InetContainer with scopes of containing and contained (mast…
bde0f12 
…odon#32802)
@mjankowski
Use existing arel scopes instead of string ordering (mastodon#32801)
10c895d
@mjankowski
Use enum-generated IpBlock.severity... scopes (mastodon#31210)
1e71c4e
@ClearlyClaire
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-s…
f0f807c 
…oc/merge-upstream
@ClearlyClaire
[Glitch] Fix alt-text pop-in not using the translated description
d19d7a2 
Port 0a1b5df to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Add year in review feature to web UI
3244926 
Port d6349c0 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix out-of-view post contents being inconsistent with in-vie…
8037892 
…w post contents

Port d482211 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix list of follow requests not having a back button
f3eac6f 
Port 6ae1fcd to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from 8ccb6f1 to f3eac6f Compare November 10, 2024 12:50
@ClearlyClaire ClearlyClaire marked this pull request as ready for review November 10, 2024 14:03
@ClearlyClaire ClearlyClaire merged commit 710d0bd into glitch-soc:main Nov 10, 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 @Gargron @oneiros