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

2024.11.0으로 업그레이드 (PR 재수정) #26

Merged
merged 273 commits into from
Dec 7, 2024
Merged

2024.11.0으로 업그레이드 (PR 재수정) #26

merged 273 commits into from
Dec 7, 2024

Conversation

HotoRas
Copy link

@HotoRas HotoRas commented Nov 28, 2024 •
edited
Loading

What

이중 삼중으로 브랜치 따기

Why

디버깅 편의성

Additional info (optional)

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Add story of storybook
  • (If needed) Update CHANGELOG.md
  • (If possible) Add tests
  • (If possible) Publish docker image

kakkokari-gtyih and others added 30 commits October 3, 2024 21:01
@kakkokari-gtyih
fix: 初期パスワードをコメントアウト (misskey-dev#14682)
7bdc4e8 
* fix: 初期パスワードをコメントアウト

* 🎨

* fix indent
@github-actions
Bump version to 2024.10.0-alpha.1
fa2558f
@github-actions
Bump version to 2024.10.0-beta.2
650e22c
@kakkokari-gtyih
fix(test): 初期セットアップで初期パスワードを入力していないのを修正 (misskey-dev#14685)
a08a38c
@syuilo
🎨
c1597be
@syuilo
update deps
864327b
@syuilo
🎨
ed71b0b
@syuilo
🎨
2fa805b
@syuilo
fix test
1aee260
@syuilo
Update generate.tsx
e344650
@kakkokari-gtyih @syuilo
enhance(frontend): サインイン画面の改善 (misskey-dev#14658)
975c2e7 
* wip

* Update MkSignin.vue

* Update MkSignin.vue

* wip

* Update CHANGELOG.md

* enhance(frontend): サインイン画面の改善

* Update Changelog

* 14655の変更取り込み

* spdx

* fix

* fix

* fix

* 🎨

* 🎨

* 🎨

* 🎨

* Captchaがリセットされない問題を修正

* 次の処理をsignin apiから読み取るように

* Add Comments

* fix

* fix test

* attempt to fix test

* fix test

* fix test

* fix test

* fix

* fix test

* fix: 一部のエラーがちゃんと出るように

* Update Changelog

* 🎨

* 🎨

* remove border

---------

Co-authored-by: syuilo <[email protected]>
@github-actions
Bump version to 2024.10.0-beta.3
3b0b4f8
@syuilo
fix(frontend): リンク動作のオーバーライドが動作していないのを修正
ea2675e
@syuilo
🎨
2639e92
@syuilo
🎨
708ffae
@kakkokari-gtyih
fix(frontend): canvas-confettiの型定義を追加 (misskey-dev#14692)
d8f30fb
@syuilo
New Crowdin updates (misskey-dev#14677)
2340de0 
* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)
@github-actions
Bump version to 2024.10.0-beta.4
3d637af
@kakkokari-gtyih
fix(frontend): ログイン画面でキャプチャが表示されない問題を修正 (misskey-dev#14694)
b36d13d 
* fix(frontend): ログイン画面でキャプチャが表示されない問題を修正

* rename
@syuilo
🎨
fa06c59
@kakkokari-gtyih
fix: signin の資格情報が足りないだけの場合はエラーにせず200を返すように (misskey-dev#14700)
ae3c155 
* fix: signin の資格情報が足りないだけの場合はエラーにせず200を返すように

* run api extractor

* fix

* fix

* fix test

* /signin -> /signin-flow

* fix

* fix lint

* rename

* fix

* fix
@samunohito
feat(backend): 通報および通報解決時に送出されるSystemWebhookにユーザ情報を含めるようにする (misskey-…
8869846 
…dev#14698)

* feat(backend): 通報および通報解決時に送出されるSystemWebhookにユーザ情報を含めるようにする

* テスト送信もペイロード形式を合わせる

* add spaces

* fix test
@kakkokari-gtyih
misskey-dev#14675 レビューの修正 (misskey-dev#14705)
d8bf1ff
@samunohito
enhance: 人気のPlayを10件以上表示できるように (misskey-dev#14443)
0d7d109 
Co-authored-by: osamu <[email protected]>
@syuilo
🎨
043fef9
@syuilo
feat: 通報の強化 (misskey-dev#14704)
d8cb730 
* wip

* Update CHANGELOG.md

* lint

* Update types.ts

* wip

* ✌️

* Update MkAbuseReport.vue

* tweak
@kakkokari-gtyih @u1-liquid
fix(backend/test): misskey-dev#14558 以降e2eテストがたまに失敗する問題を修正 (misskey-d…
9d02697 
…ev#14709)

* fix(backend/test): MisskeyIO#727 以降e2eテストがたまに失敗する問題を修正 (MisskeyIO#735)

* ✌️

---------

Co-authored-by: まっちゃとーにゅ <[email protected]>
@github-actions
Bump version to 2024.10.0-beta.5
254c063
@syuilo
🎨
057a6d7
@syuilo
fix of d8cb730
ddc799f
kakkokari-gtyih and others added 12 commits November 24, 2024 09:41
@kakkokari-gtyih @K4rakara @HotoRas
fix(backend): fix type error(s) in security fixes (misskey-dev#15009)
b8af1d7 
* Fix type error in security fixes

(cherry picked from commit fa3cf6c2996741e642955c5e2fca8ad785e83205)

* Fix error in test function calls

(cherry picked from commit 1758f29364eca3cbd13dbb5c84909c93712b3b3b)

* Fix style error

(cherry picked from commit 23c4aa25714af145098baa7edd74c1d217e51c1a)

* Fix another style error

(cherry picked from commit 36af07abe28bec670aaebf9f5af5694bb582c29a)

* Fix `.punyHost` misuse

(cherry picked from commit 6027b516e1c82324d55d6e54d0e17cbd816feb42)

* attempt to fix test: make yaml valid

---------

Co-authored-by: Julia Johannesen <[email protected]>
@kakkokari-gtyih @HotoRas
fix(backend): fix apResolver (misskey-dev#15010)
82a6c46 
* fix(backend): fix apResolver

* fix

* add comments

* tweak comment
@github-actions @HotoRas
Bump version to 2024.11.0-alpha.3
cc923d1
@syuilo @HotoRas
Update CHANGELOG.md
9540a60
@kakkokari-gtyih @HotoRas
Update CHANGELOG.md
fd95085
@github-actions @HotoRas
Bump version to 2024.11.0-beta.4
41fce52
@anatawa12 @HotoRas
ci: reset prerelease number on release (misskey-dev#15024)
4c2d6b0
@kakkokari-gtyih @warriordog @HotoRas
fix(backend): Inboxのエラーをthrowせずreturnしている問題を修正 (misskey-dev#15022)
af94f12 
* fix exception handling for Like activities

(cherry picked from commit 8f42e8434eaebe3aba5d1980c57f49dd8ad0de91)

* fix exception handling for Announce activities

(cherry picked from commit cfc3ab4b045af0674122fa49176431860176358b)

* fix exception handling for Undo activities

* Update Changelog

---------

Co-authored-by: Hazelnoot <[email protected]>
@syuilo @HotoRas
New Crowdin updates (misskey-dev#15027)
1c8ddf6 
* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)
@github-actions @HotoRas
Release: 2024.11.0
ec7a103
@HotoRas
2024.11.0+neko-rc
f88ffc5 
general:
- Misskey 2024.11.0으로 업그레이드

frontend:
- fix: 계정 삭제의 모더레이션 로그가 동작하지 않는 것을 수정(misskey-dev#14996)
- enhance: 비로그인 상태에서 Misskey를 열었을 때의 퍼포먼스를 향상

server:
- fix: 리노트 뮤트가 신규 투고 통지에 대해 작용하지 않았던 문제를 수정
- fix: 보안 관련 수정
- fix: Inbox 처리에서 발생하는 오류를 실수로 Activity로 처리하는 경우가 있는 문제를 수정 (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/730)
@HotoRas
Merge pull request #25 from HotoRas/update-neko/2024.11.0-fixup
4744eb4 
Update neko/2024.11.0 fixup
@HotoRas HotoRas linked an issue Nov 28, 2024 that may be closed by this pull request
미스키에 가입 승인제 도입 #9
Closed
1 task
Hoto-Cocoa
Hoto-Cocoa suggested changes Nov 28, 2024
View reviewed changes
Copy link

@Hoto-Cocoa Hoto-Cocoa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

코드 받아서 라온님과 실행하고 테스트 해봤는데, 잘 동작하지만 비로그인 메인 페이지에 가입 버튼이 보여야 한다고 하시네요. 나머지 부분에는 별 문제가 없는 것 같다고 하시니 이 부분 고치고 리뷰 하고 병합하고 배포하면 될 것 같아요.

@seojangho
Copy link
Collaborator

별 문제 없을것 같지만 오늘 밤에 한번 더 테스트 돌리고 review하겠습니다

seojangho
seojangho approved these changes Nov 28, 2024
View reviewed changes
Copy link
Collaborator

@seojangho seojangho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, 고생하셨습니다.

아래 사항에 대해서 머지 후 QA가 이루어지면 좋겠습니다. (제가 계획할게요)

  • 프꾸 여러개 잘 연합되는지
  • 가입이 아직 미승인된 유저가 할 수 있는 API/할 수 없는 API 확인
  • 웹소켓 끊겼을때 메시지

긴 시간 고생하셨습니다. 특히 중간중간에 타입 any인거 고친부분이라거나 등등은 잘 갈무리해서 원판 미스키에도 PR 보내볼 수 있을것 같아요.

노고에 감사드립니다.

@HotoRas
Copy link
Author

HotoRas commented Dec 7, 2024

머지하겠습니다. 고생하셨습니다.

@HotoRas HotoRas merged commit a4cf46d into neko Dec 7, 2024
23 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hoto-Cocoa Hoto-Cocoa Hoto-Cocoa requested changes

@seojangho seojangho seojangho approved these changes

Assignees

@seojangho seojangho

@Hoto-Cocoa Hoto-Cocoa

@HotoRas HotoRas

@laonmofu laonmofu

Labels
packages/backend:test packages/backend packages/frontend:test packages/frontend packages/misskey-js packages/sw
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

미스키에 가입 승인제 도입