summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2024-11-17 17:32:28 +0900
committerGitHub <noreply@github.com>2024-11-17 17:32:28 +0900
commit00b8d0c0720406e5003bf193b8046ee9d11ee1df (patch)
tree3a4f56219aa462d9e5acb80200a3cae0eae061b5 /CONTRIBUTING.md
parentUpdate CHANGELOG.md (diff)
downloadsharkey-00b8d0c0720406e5003bf193b8046ee9d11ee1df.tar.gz
sharkey-00b8d0c0720406e5003bf193b8046ee9d11ee1df.tar.bz2
sharkey-00b8d0c0720406e5003bf193b8046ee9d11ee1df.zip
Update CONTRIBUTING.md
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f8af6b3df0..fcce19405b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -101,6 +101,20 @@ Be willing to comment on the good points and not just the things you want fixed
- Are there any omissions or gaps?
- Does it check for anomalies?
+## Security Advisory
+### For reporter
+Thank you for your reporting!
+
+If you can also create a patch to fix the vulnerability, please create a PR on the private fork.
+
+> ![note]
+> There is a GitHub bug that prevents merging if a PR not following the develop branch of upstream, so please follow the develop branch.
+
+### For misskey-dev member
+修正PRがdevelopに追従されていないとマージできないので、マージできなかったら
+> Could you merge or rebase onto upstream develop branch?
+などと伝える。
+
## Deploy
The `/deploy` command by issue comment can be used to deploy the contents of a PR to the preview environment.
```