summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-19 17:04:05 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-19 17:04:05 +0000
commit33eae33423d224e10a3a9aeefd70d632d70b20fe (patch)
tree5e28e7be8806169ed21a0607c5b266124133d94a
parent6cc3cc515267712733d6dd1643080bd6b2cc6cdc (diff)
parent6413bfb5c640d44d38fe4054c7b33f1db285c687 (diff)
downloadgitlab-ce-33eae33423d224e10a3a9aeefd70d632d70b20fe.tar.gz
Merge branch 'full-post-to-oss-security' of /home/git/repositories/gitlab/gitlabhq
-rw-r--r--doc/release/security.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/release/security.md b/doc/release/security.md
index ca217f77b55..a77cbae3eaa 100644
--- a/doc/release/security.md
+++ b/doc/release/security.md
@@ -26,10 +26,10 @@ Please report suspected security vulnerabilities in private to support@gitlab.co
1. Send out an email to the subscribers mailing list on MailChimp
1. Send out an email to [the community google mailing list](https://groups.google.com/forum/#!forum/gitlabhq)
1. Send out an email to [the GitLab newsletter list](http://gitlab.us5.list-manage.com/subscribe?u=498dccd07cf3e9482bee33ba4&id=98a9a4992c)
-1. Post a signed copy of our announcement to [oss-security](http://www.openwall.com/lists/oss-security/) and request a CVE number
+1. Post a signed copy of our complete announcement to [oss-security](http://www.openwall.com/lists/oss-security/) and request a CVE number
1. Add the security researcher to the [Security Researcher Acknowledgments list](http://www.gitlab.com/vulnerability-acknowledgements/)
1. Thank the security researcher in an email for their cooperation
-1. Update the blogposts when we receive the CVE number
+1. Update the blogpost and the CHANGELOG when we receive the CVE number
The timing of the code merge into master should be coordinated in advance.
After the merge we strive to publish the announcements within 60 minutes.