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 - 4.4.0-alpha.1 #71

Merged
merged 377 commits into from
Dec 16, 2024
Merged

Merge upstream - 4.4.0-alpha.1 #71

merged 377 commits into from
Dec 16, 2024

Conversation

sneakers-the-rat
Copy link
Collaborator

just regular kind

ClearlyClaire and others added 30 commits November 4, 2024 11:08
@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)
@ClearlyClaire
Merge pull request glitch-soc#2892 from ClearlyClaire/glitch-soc/merg…
bf454e9 
…e-upstream

Merge upstream changes up to b06fd54
@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
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)
ThisIsMissEm and others added 28 commits December 1, 2024 18:47
@ThisIsMissEm @Gargron @ClearlyClaire
[Glitch] Add link from Web UI for Hashtags to the Moderation UI
170f76c 
Port eef8d2c to glitch-soc

Co-authored-by: Eugen Rochko <[email protected]>
Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Change design of modal loading and error screens in web UI
64fc79c 
Port 7f2cfcc to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
Merge commit '75ecc6df068ec2c21b26f05692eb5dfdc35671fa' into glitch-s…
10a24d6 
…oc/merge-upstream
@Gargron @ClearlyClaire
[Glitch] Change server rules to be collapsible
e03b586 
Port 986a367 to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Change "social web" to "fediverse" in a few banners in web UI
b55c31e 
Port 4de108e to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
Merge pull request glitch-soc#2910 from ClearlyClaire/glitch-soc/merg…
5550f53 
…e-upstream

Merge upstream changes up to 75ecc6d
@mjankowski
Add shared example for RankedTrend concern (mastodon#33125)
3cd3085
@mjankowski
Always validate inbox_url presence on Relay (mastodon#32364)
a17e7d1
@rrgeorge @ClearlyClaire
Update robots.txt to prevent crawling of domain blocks (mastodon#26470)
a98a8ee 
Co-authored-by: Claire <[email protected]>
@renovate
Update devDependencies (non-major) (mastodon#33126)
462e071 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update docker/dockerfile Docker tag to v1.12 (mastodon#33127)
9e8da55 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.175.0 (mastodon#33128)
f72831b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@Gargron
Change profile bios to be displayed during onboarding in web UI (mast…
ca11740 
…odon#33119)
@renovate
Update dependency active_model_serializers to v0.10.15 (mastodon#33120)
459be1f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33114)
4b80ff9 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Fix processing incoming post edits with mentions to unresolvable acco…
5c06fe4 
…unts (mastodon#33129)
@ShadowJonathan
Fix exclusive lists interfering with notifications (mastodon#28162)
360b6d3
@renovate
Update dependency json-schema to v5.1.1 (mastodon#33132)
de37bc7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Add coverage for api/v1/push/subscriptions#show action (mastodon#33134
752d49e 
)
@ClearlyClaire
Port missed CSS change from latest ported upstream changes (glitch-so…
543eced 
…c#2911)
@ClearlyClaire
Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-s…
c2817c7 
…oc/merge-upstream

Conflicts:
- `app/lib/feed_manager.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
  Ditto.
@Gargron @ClearlyClaire
[Glitch] Change profile bios to be displayed during onboarding in web UI
119b758 
Port ca11740 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
Merge pull request glitch-soc#2912 from ClearlyClaire/glitch-soc/merg…
ec9f360 
…e-upstream

Merge upstream changes up to 752d49e
@ClearlyClaire
Remove status background feature (glitch-soc#2640)
28751ff
@sneakers-the-rat
Merge branch 'glitch-soc-main' into merge-upstream
2c4267f
@sneakers-the-rat
Merge branch 'dev' into merge-upstream
e9e6eaf
@sneakers-the-rat
update actionpack bc security advisory
f44aaf8
@sneakers-the-rat
i18n
e1c5b02
@sneakers-the-rat
Copy link
Collaborator Author

not sure why we are getting a codeql problem here:
https://github.com/NeuromatchAcademy/mastodon/runs/34456452143

that line of ours:

mastodon/app/controllers/api/v1/tags_controller.rb

Line 29 in e1c5b02

return not_found unless Tag::HASHTAG_NAME_RE.match?(params[:id])

is the same as upstream: https://github.com/mastodon/mastodon/blob/3cf6681736bae45cf13bf48cb2a72d3ac60bef60/app/controllers/api/v1/tags_controller.rb#L29

and so is the regex pattern. so i'm gonna dismiss that one

@sneakers-the-rat sneakers-the-rat merged commit df676a6 into main Dec 16, 2024
32 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.