Skip to content

Commit f11ddef

Browse files
merging all conflicts
2 parents 4a3b7fb + 2859efa commit f11ddef

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.github/workflows/discord_notify.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Discord Notify
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
types: [opened, ready_for_review]
66

77
permissions: {}
@@ -14,7 +14,6 @@ jobs:
1414
contents: read
1515
with:
1616
actor: ${{ github.event.pull_request.user.login }}
17-
is_remote: true
1817

1918
notify:
2019
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}

.github/workflows/label_core_team_prs.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Label Core Team PRs
22

33
on:
4-
pull_request:
4+
pull_request_target:
55

66
permissions: {}
77

@@ -18,7 +18,6 @@ jobs:
1818
contents: read
1919
with:
2020
actor: ${{ github.event.pull_request.user.login }}
21-
is_remote: true
2221

2322
label:
2423
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}

src/content/community/meetups.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ title: React ミーティング
4747
## Colombia {/*colombia*/}
4848
* [Medellin](https://www.meetup.com/React-Medellin/)
4949

50+
## Czechia {/*czechia*/}
51+
* [Prague](https://guild.host/react-prague/)
52+
5053
## Denmark {/*denmark*/}
5154
* [Aalborg](https://www.meetup.com/Aalborg-React-React-Native-Meetup/)
5255
* [Aarhus](https://www.meetup.com/Aarhus-ReactJS-Meetup/)

src/content/reference/react-dom/hooks/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ title: "組み込みの React DOM フック"
1414

1515
*フォーム*により、情報を送信するためのインタラクティブなコントロールを作成できます。コンポーネント内でフォームを管理するために以下のフックを使用できます。
1616

17+
<<<<<<< HEAD
1718
* [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) によりフォームのステータスに基づいて UI を更新できます。
19+
=======
20+
* [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) allows you to make updates to the UI based on the status of a form.
21+
>>>>>>> 2859efa07357dfc2927517ce9765515acf903c7c
1822
1923
```js
2024
function Form({ action }) {

0 commit comments

Comments
 (0)