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.

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

test(backend): goodbye, Lenna #14111 #208

Merged
merged 1 commit into from
Jul 3, 2024
Merged

test(backend): goodbye, Lenna #14111 #208

merged 1 commit into from
Jul 3, 2024

Conversation

Sayamame-beans
Copy link

Cherry-picked from misskey-dev#14111 but base commit is misskey-dev@eafae79

What

Why

Additional info (optional)

リモート側のブランチ消えてて上手くcherry-pick出来なかったのでmerge commitのcherry-pickでお茶を濁しています
正しいやり方が知りたい…

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

@Sayamame-beans
Copy link
Author

@anatawa12 こういう場合の正しいやり方って他にありますか?

Copy link

github-actions bot commented Jul 3, 2024

このPRによるapi.jsonの差分

差分はこちら
--- base
+++ head
@@ -4916,7 +4916,7 @@
                     },
                     "name": {
                       "type": "string",
-                      "example": "lenna.jpg"
+                      "example": "192.jpg"
                     },
                     "type": {
                       "type": "string",
@@ -77734,7 +77734,7 @@
           },
           "name": {
             "type": "string",
-            "example": "lenna.jpg"
+            "example": "192.jpg"
           },
           "type": {
             "type": "string",

Get diff files from Workflow Page

@anatawa12
Copy link
Collaborator

こういう場合の正しいやり方って他にありますか?

普通にマージコミットをpickするでいいと思うので見た目良さそう

@anatawa12 anatawa12 merged commit d34f224 into develop Jul 3, 2024
26 checks passed
@anatawa12 anatawa12 deleted the pick-14111 branch July 3, 2024 13:07
anatawa12 pushed a commit that referenced this pull request Jul 31, 2024
* improve(frontend): サーバー情報・お問い合わせページを改修 (misskey-dev#238)

* Revert "Revert "enhance(frontend): add contact page" (#208)" (This reverts commit 5a329a0.)

* improve(frontend): サーバー情報・お問い合わせページを改修

(cherry picked from commit e72758d)

* fix

* Update Changelog

* tweak

* lint

* 既存の翻訳を使用するように

---------

Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants