summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <marcia@gitlab.com>2019-06-14 09:18:38 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-06-14 09:18:38 +0000
commit229212e828db382081fbd0395ce53a3133a70ca1 (patch)
tree32fb8a43a4ab45d602a1e51a12457944115b9b85
parent72b107a5fc11f2c982273ee932cba94fe9f1aa58 (diff)
parent318e7c12241ff155e95df0628aec2fc525380747 (diff)
downloadgitlab-ce-229212e828db382081fbd0395ce53a3133a70ca1.tar.gz
Merge branch 'fix-link-in-process-docs' into 'master'
Fix a broken link in PROCESS.md See merge request gitlab-org/gitlab-ce!29607
-rw-r--r--PROCESS.md4
1 files changed, 1 insertions, 3 deletions
diff --git a/PROCESS.md b/PROCESS.md
index 9e971ef7531..07b150ea463 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -86,13 +86,11 @@ 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
-The feature freeze on the 7th has been discontinued. [Transition period overview]
+The feature freeze on the 7th has been discontinued. The [transition period overview](https://gitlab.com/gitlab-org/release/docs/blob/21cbd409dd5f157fe252f254f3e897f01908abe2/general/deploy/auto-deploy-transition.md#transition)
describes the change to this process. During the transition period, the only guarantee that
a change will be included in the release on the 22nd is if the change has been
deployed to GitLab.com prior to this date.
-[Transition period]: https://gitlab.com/gitlab-org/release/docs/blob/21cbd409dd5f157fe252f254f3e897f01908abe2/general/deploy/auto-deploy-transition.md#transition
-
### Feature flags
Merge requests that make changes hidden behind a feature flag, or remove an