Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2019-04-25 01:50:10 +0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2019-04-25 01:50:10 +0300
commit6b8f77ddf36201af4ac0c99c3a51b0bfabeaf85f (patch)
treed3bbdec22b4e8e783254b3d159cba40f7f8c46df
parenta2654b34d442db2458a258c92dc1352d112116d6 (diff)
Apply suggestion to doc/PROCESS.md
-rw-r--r--doc/PROCESS.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/PROCESS.md b/doc/PROCESS.md
index 316dc9e39..ff4983a9a 100644
--- a/doc/PROCESS.md
+++ b/doc/PROCESS.md
@@ -39,7 +39,7 @@ GITLAB_TOKEN=$(cat /path/to/gitlab-token) _support/update-downstream-server-vers
- Check what version of Gitaly you're backporting by opening the `GITALY_SERVER_VERSION` file
in GitLab-Rails
- Create a stable branch for this version:
- - `git checkout vX.Y.Z`, than `git checkout -b X-Y-stable`, and push it to the main gitlab.com repository
+ - `git checkout vX.Y.Z`, then `git checkout -b X-Y-stable`, and push it to the main gitlab.com repository
- Create the required merge requests on `dev.gitlab.org`, making sure to bump `GITALY_SERVER_VERSION` on the client (gitlab-rails) in every backported merge request
- Follow the usual security process