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 #2170

Merged
merged 45 commits into from Apr 9, 2023
Merged

Merge upstream changes #2170

merged 45 commits into from Apr 9, 2023

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Apr 9, 2023 •
edited

Conflicts

  • package.json:
    Upstream removed a dependency that was textually close to a glitch-soc-only dependency.
    Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.

Ported changes

Postponed changes

Additional changes

dependabot bot and others added 30 commits April 4, 2023 14:25
@dependabot
Bump addressable from 2.8.1 to 2.8.2 (mastodon#24392)
538914d 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump typescript from 4.9.5 to 5.0.3 (mastodon#24398)
0358abe 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nschonni
Add typechecking in CI (mastodon#24405)
b80a7b0
@nschonni
HTML string attributes set as booleans (mastodon#24408)
a425915
@nschonni
Ensure tabIndex is number instead of string (mastodon#24409)
ec0c104
@ClearlyClaire
Fix styling regressions from RTL layout refactor (mastodon#24415)
45848d6
@nschonni
Enable Stylelint property-no-unknown (mastodon#24404)
cd14f71
@nschonni
SUBMIT doesn't exist on XMLHttpRequest (mastodon#24423)
ab3f23d
@nschonni
Set marginRight as string (mastodon#24422)
927b2fd
@nschonni
Update display_media typing to string (mastodon#24416)
17b2fd2
@dependabot
Bump aws-sdk-s3 from 1.119.2 to 1.120.0 (mastodon#24401)
60602fd 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump capybara from 3.38.0 to 3.39.0 (mastodon#24395)
e2f58c8 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump puma from 6.1.1 to 6.2.1 (mastodon#24402)
4fcfeab 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump rubocop from 1.48.1 to 1.49.0 (mastodon#24387)
966d7cf 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@c960657
Fix height of announcements not being updated when using reduced anim…
ffd5b2e 
…ations (mastodon#24354)
@nschonni
Check for missing JSON translations (mastodon#24338)
c76d19e
@ClearlyClaire
Fix user archive takeouts when using OpenStack Swift (mastodon#24431)
9d08b81
@nschonni
Fix DevContainer post-create warnings (mastodon#23977)
b8ff498
@Gargron @ykzts
New Crowdin updates (mastodon#24378)
c9f3438 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
@ClearlyClaire
Bump version to v4.1.2 (mastodon#24427)
3d8bd09
@ClearlyClaire
Fix user settings migration script failing in some cases (mastodon#24453
369f239 
)
@c960657
Fix account header image missing in low-res (mastodon#24433)
d7b8c6d
@nschonni
Remove Array.prototype.includes polyfill (mastodon#24234)
c0886de
@nschonni
Remove duplicate ca-certificates Docker install (mastodon#24231)
26682d4
@mjankowski
Remove unused methods in 2FA OTP Auth Controller (mastodon#24220)
d193bc8
@nschonni
Update Node.js to 16.20.0 (mastodon#24316)
8628610
@mjankowski
Expand coverage for "system checks" (mastodon#24216)
9d39b11
@c960657
Fix loading spinner + infinite scroll for private mentions (mastodon#…
9ef9974 
…24446)
@c960657
Fix tooltip for dates without time (mastodon#24244)
aa136cf
@ClearlyClaire
Fix crash in NotifyService when trying to send an email notification …
99e3e15 
…for post edits (mastodon#24460)
@ClearlyClaire
Merge branch 'main' into glitch-soc/merge-upstream
ce12934 
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
@ClearlyClaire ClearlyClaire changed the title Glitch soc/merge upstream Merge upstream changes Apr 9, 2023
@ClearlyClaire ClearlyClaire marked this pull request as draft April 9, 2023 09:47
nschonni and others added 14 commits April 9, 2023 11:56
@nschonni @ClearlyClaire
[Glitch] HTML string attributes set as booleans
0f62451 
Port a425915 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@nschonni @ClearlyClaire
[Glitch] SUBMIT doesn't exist on XMLHttpRequest
358e406 
Port ab3f23d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@nschonni @ClearlyClaire
[Glitch] Set marginRight as string
f3f7ef2 
Port 927b2fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@nschonni @ClearlyClaire
[Glitch] Update display_media typing to string
791e712 
Port 17b2fd2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@c960657 @ClearlyClaire
[Glitch] Fix height of announcements not being updated when using red…
74c61b0 
…uced animations

Port ffd5b2e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@c960657 @ClearlyClaire
[Glitch] Fix account header image missing in low-res
df6602e 
Port d7b8c6d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@nschonni @ClearlyClaire
[Glitch] Remove Array.prototype.includes polyfill
5b88b7e 
Port c0886de to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@c960657 @ClearlyClaire
[Glitch] Fix tooltip for dates without time
7b04c2f 
Port aa136cf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@nschonni @ClearlyClaire
[Glitch] Enable Stylelint property-no-unknown
b756e49 
Port cd14f71 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@c960657 @ClearlyClaire
[Glitch] Fix loading spinner + infinite scroll for private mentions
53cdcce 
Port 9ef9974 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@nschonni @ClearlyClaire
[Glitch] Ensure tabIndex is number instead of string
bfe46d0 
Port ec0c104 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix user settings migration script failing in some cases
251c5ed
@ClearlyClaire
Move glitch-soc-only translation strings out of `app/javascript/masto…
c11e69f 
…dono/locales`
@ClearlyClaire
Run yarn manage:translations
63a39ae
@ClearlyClaire ClearlyClaire marked this pull request as ready for review April 9, 2023 14:37
@ClearlyClaire ClearlyClaire mentioned this pull request Apr 9, 2023
Closed
@ClearlyClaire ClearlyClaire merged commit 14aa7b3 into glitch-soc:main Apr 9, 2023
32 of 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.

Tried to load unspecified class: Symbol when migrating move_user_settings.rb
5 participants
@ClearlyClaire @nschonni @c960657 @Gargron @mjankowski