diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-04-14 09:06:42 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-04-14 09:06:42 +0200 |
| commit | c927f0620a85a5b43e76d0fdd0a7d276ba9e44aa (patch) | |
| tree | 2a0de75005f8c6bdd1c7e1e45f277bbb7fbaa760 /doc/release/patch.md | |
| parent | f7d2f36084aaf3ce40fac748b7cfe034f7738b0a (diff) | |
| download | gitlab-ce-c927f0620a85a5b43e76d0fdd0a7d276ba9e44aa.tar.gz | |
Update security document with the link to patch document.
Diffstat (limited to 'doc/release/patch.md')
| -rw-r--r-- | doc/release/patch.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/release/patch.md b/doc/release/patch.md index dc9cce55d98..30bb39b4e49 100644 --- a/doc/release/patch.md +++ b/doc/release/patch.md @@ -12,6 +12,7 @@ Otherwise include it in the monthly release and note there was a regression fix 1. Create an issue on private GitLab development server 1. Name the issue "Release X.X.X CE and X.X.X EE", this will make searching easier 1. Fix the issue on a feature branch, do this on the private GitLab development server +1. Consider creating and testing workarounds 1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch 1. In a separate commit in the stable branch, update the VERSION and CHANGELOG 1. For EE, update the CHANGELOG-EE if it is EE specific fix. Otherwise, merge the stable CE branch and add to CHANGELOG-EE "Merge community edition changes for version X.X.X" |