diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-08-15 21:01:05 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-08-15 21:01:05 +0300 |
| commit | ae0b29bacf06026b0cb98878d869d6d2c3708b02 (patch) | |
| tree | 6e1b48930066644e81272b31fb5024fcc7bc1898 | |
| parent | e091fb7fe40d97c7eecba9d9dded027393261e7e (diff) | |
| parent | 9d5de5e9c41411eceb6f3db9a5162a2b727511f1 (diff) | |
Merge branch 'po-security-process-sync-master' into 'master'
Update security process to sync master
See merge request gitlab-org/gitaly!1416
| -rw-r--r-- | doc/PROCESS.md | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/doc/PROCESS.md b/doc/PROCESS.md index 3ae6124a2..0da84c824 100644 --- a/doc/PROCESS.md +++ b/doc/PROCESS.md @@ -83,15 +83,27 @@ As a sanity check, you can verify your repository only points to remotes in and [GitLab-EE](https://dev.gitlab.org/gitlab/gitlab-ee). - Follow the [usual security process](https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md) 1. Only after the security release occurs and the details are made public: + 1. **Maintainers** Ensure master branch on dev.gitlab.com is synced with gitlab.com: + 1. `git checkout master` + 1. `git remote add gitlab.com git@gitlab.com:gitlab-org/gitaly.git` + 1. `git pull gitlab.com master` + 1. `git push origin` + 1. `git remote remove gitlab.com` + 1. Ensure no origins exist that point to gitlab.com: `git remote -v` 1. **Contributors:** Merge in your request against master on dev.gitlab.com 1. **Maintainers:** Bring gitlab.com up to sync with dev.gitlab.org: 1. `git remote add gitlab.com git@gitlab.com:gitlab-org/gitaly.git` 1. `git fetch gitlab.com` 1. `git checkout -b gitlab-com-master gitlab.com/master` 1. `git merge origin/master` (note: in this repo, origin points to dev.gitlab.org) - 1. `git push gitlab.com master` + 1. `git push gitlab.com gitlab-com-master:master` 1. If the push fails, try running `git pull gitlab.com master` and then try the push again. + 1. Upon success, remove the branch and remote: + 1. `git checkout master` + 1. `git branch -D gitlab-com-master` + 1. `git remote remove gitlab.com` + 1. Ensure no origins exist that point to gitlab.com: `git remote -v` 1. **Maintainers:** Push all the newly released security tags in `dev.gitlab.org` to the public gitlab.com instance: 1. `git remote add gitlab.com git@gitlab.com:gitlab-org/gitaly.git` |