summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-03-07 17:35:53 +0000
committerRobert Speicher <robert@gitlab.com>2018-03-07 17:35:53 +0000
commit10cf1294cb5f4070ae9f0ade0b7610cb799baeae (patch)
treeaedbb0afa71096e145e5b6f3f5a30254273593bd
parent2f6deb128a4270712aedd6feddee32c963080270 (diff)
parente051e28ec6cf680510f786ef34959046ac635bef (diff)
downloadgitlab-ce-10cf1294cb5f4070ae9f0ade0b7610cb799baeae.tar.gz
Merge branch 'patch-28-docs' into 'master'
Change to Pacific Time Zone [ci skip] See merge request gitlab-org/gitlab-ce!17600
-rw-r--r--PROCESS.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/PROCESS.md b/PROCESS.md
index c24210341e0..5ae191840ff 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -71,7 +71,7 @@ star, smile, etc.). Some good tips about code reviews can be found in our
## Feature freeze on the 7th for the release on the 22nd
-After 7th at 23:59 (Pacific Standard Time Zone) of each month, RC1 of the upcoming release (to be shipped on the 22nd) is created and deployed to GitLab.com and the stable branch for this release is frozen, which means master is no longer merged into it.
+After 7th at 23:59 (Pacific Time Zone) of each month, RC1 of the upcoming release (to be shipped on the 22nd) is created and deployed to GitLab.com and the stable branch for this release is frozen, which means master is no longer merged into it.
Merge requests may still be merged into master during this period,
but they will go into the _next_ release, unless they are manually cherry-picked into the stable branch.