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 77cd16f4ee7ab807df6fffb1538a6659a8182a9e #2889

Merged
merged 69 commits into from
Oct 26, 2024
Merged

Merge upstream changes up to 77cd16f4ee7ab807df6fffb1538a6659a8182a9e #2889

merged 69 commits into from
Oct 26, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Oct 26, 2024 •
edited
Loading

Conflicts

  • app/javascript/styles/mastodon/components.scss:
    Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image.
    Removed the styling as upstream did.
  • app/models/account.rb:
    Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits.
    Ported upstream's changes.
  • yarn.lock:
    Dependencies adjacent to glitch-soc-only dependencies updated.
    Updated them as well.

Ported changes

Additional changes

  • 8a222b3 (fix assets build failure caused by search path inconsistency in CSS files)

renchap and others added 30 commits October 21, 2024 07:08
@renchap
Replace execCommand for copying text with the modern clipboard API (
fb6d7ed 
mastodon#32598)
@renovate
Update dependency libvips to v8.15.5 (mastodon#32596)
52af99c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update DefinitelyTyped types (non-major) (mastodon#32278)
a19a120 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update Yarn to v4.5.1 (mastodon#32586)
8e39cc9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update devDependencies (non-major) (mastodon#32603)
35da47c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency brakeman to v6.2.2 (mastodon#32587)
2e0bb35 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency faker to v3.5.1 (mastodon#32588)
650f224 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.169.0 (mastodon#32552)
4a65fa7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @renchap
Update eslint (non-major) (mastodon#32279)
11a63b2 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <[email protected]>
@renovate
Update dependency ruby-prof to v1.7.1 (mastodon#32599)
29f98b3 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency pino to v9.5.0 (mastodon#32511)
e05f9fe 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Pre-import Rails 7.2 generated config minor changes (mastodon#30579)
40b4f73
@renovate
Update dependency @reduxjs/toolkit to v2.3.0 (mastodon#32497)
bd850d1 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency eslint-plugin-react-hooks to v5 (mastodon#32425)
699f75b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency mime-types to '~> 3.6.0' (mastodon#32215)
4d5b2de 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency ubuntu to v24 (mastodon#32280)
36f1ec1 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency eslint-plugin-formatjs to v5 (mastodon#32087)
bb05325 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ThisIsMissEm
Fix 'unknown' media attachment type rendering (mastodon#32613)
346cdb9
@renovate
Update formatjs monorepo (mastodon#32612)
f8a66e9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@seav
Fix tl language native name (mastodon#32606)
16597fa
@tribela
Fix that blocking was not working on link timeline (mastodon#32625)
18659f8
@oneiros
Do not change follow counters when already following (mastodon#32622)
029c99b
@mjankowski
Add coverage for AccountAlias validations (mastodon#31936)
6d2f865
@mjankowski
Add coverage for api/v1/domain_blocks/preview endpoint (mastodon#32303
0a4a73f 
)
@mjankowski
Add coverage for ActivityPub likes/shares endpoints (mastodon#32305)
67403e7
@mjankowski
Top off coverage for Appeal model (mastodon#32464)
1f37229
@mjankowski
Fortify coverage for Follow model (mastodon#32472)
c0f46e9
@mjankowski
Simplify model validation specs for Announcement (mastodon#32481)
bd0c826
@mjankowski
Worker specs coverage increase (mastodon#32541)
d1b20ea
@oneiros
Add endpoint to remove web push subscription (mastodon#32626)
05f23df
mjankowski and others added 27 commits October 24, 2024 12:44
@mjankowski
Explore more resplendent model validation specs for `Form::AdminSetti…
b16435e 
…ngs` (mastodon#32465)
@mjankowski
Contribute more coverage for Account model (mastodon#32474)
dea6c45
@mjankowski
Simplify model validation spec in AccountModerationNote/ReportNote (m…
37bcbea 
…astodon#31792)
@mjankowski
Simplify model validation specs for PreviewCard (mastodon#32469)
e5be4bf
@mjankowski
Simplify model validation specs for WebauthnCredential (mastodon#32466
4134ccd 
)
@mjankowski
Move account suspension related coverage to concern spec (mastodon#32432
2e3bbb6 
)
@mjankowski
Use subject for FeedManager lib spec (mastodon#32486)
2a13d68
@mjankowski
Provide establish_policy helper method in `AccountStatusesCleanupPo…
86132f7 
…licy` spec (mastodon#32490)
@mjankowski
Simplify model validation specs for AccountMigration (mastodon#32494)
15f6336
@mjankowski
Enrich coverage for IpBlock model (mastodon#32471)
66c0471
@mjankowski
Simplify model validation specs for AccountStatusCleanupPolicy (mas…
9464281 
…todon#32495)
@mjankowski
Simplify model validation specs for DomainAllow (mastodon#32496)
1775e15
@renovate
Update dependency pg to v1.5.9 (mastodon#32655)
0970cf8 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency pg to v8.13.1 (mastodon#32650)
097942a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update opentelemetry-ruby (non-major) (mastodon#32631)
5f58357 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency postcss-preset-env to v10.0.8 (mastodon#32647)
60b0ad0 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update babel monorepo to v7.25.9 (mastodon#32628)
aa29e42 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update formatjs monorepo (mastodon#32651)
3aa3884 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency opentelemetry-instrumentation-active_job to v0.7.8 (m…
77cd16f 
…astodon#32657)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-s…
8103e69 
…oc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
@renchap @ClearlyClaire
[Glitch] Replace execCommand for copying text with the modern `clip…
d304540 
…board` API

Port fb6d7ed to glitch-soc

Signed-off-by: Claire <[email protected]>
@ThisIsMissEm @ClearlyClaire
[Glitch] Fix 'unknown' media attachment type rendering
28287eb 
Port 346cdb9 to glitch-soc

Signed-off-by: Claire <[email protected]>
@oneiros @ClearlyClaire
[Glitch] Do not change follow counters when already following
50a40d1 
Port 029c99b to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Change design of rich text elements in web UI
227bf77 
Port d11231a to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
Fix assets build failure on glitch-soc
8a222b3
@renovate @renchap @ClearlyClaire
[Glitch] Update eslint (non-major)
e8d23f6 
Port 11a63b2 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <[email protected]>
Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Redesign Content Warning and filters
1d3d549 
Port 393f0a0 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from 49daa19 to 1d3d549 Compare October 26, 2024 12:09
@ClearlyClaire ClearlyClaire marked this pull request as ready for review October 26, 2024 18:24
@ClearlyClaire ClearlyClaire merged commit eb68d81 into glitch-soc:main Oct 26, 2024
39 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.
8 participants
@ClearlyClaire @renchap @mjankowski @ThisIsMissEm @seav @tribela @oneiros @Gargron