summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Berger <4310743-sethgitlab@users.noreply.gitlab.com>2019-09-12 00:50:45 +0000
committerSeth Berger <4310743-sethgitlab@users.noreply.gitlab.com>2019-09-12 00:50:45 +0000
commit47a26caff2f1cf0d78e342023d4f5073888bbae9 (patch)
tree624b65cc70f41b14d9b1e375f7a904103c3ab8b0
parent7d2c2cc3c52c1180cfc1a7b67d94bbd4fac06a23 (diff)
downloadgitlab-ce-47a26caff2f1cf0d78e342023d4f5073888bbae9.tar.gz
Apply suggestion to doc/development/documentation/feature-change-workflow.md
-rw-r--r--doc/development/documentation/feature-change-workflow.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/documentation/feature-change-workflow.md b/doc/development/documentation/feature-change-workflow.md
index 69a050d85e0..38ccae41df4 100644
--- a/doc/development/documentation/feature-change-workflow.md
+++ b/doc/development/documentation/feature-change-workflow.md
@@ -110,8 +110,8 @@ For feature issues requiring documentation, follow the process below unless othe
idea or outline, or request any other help, ping the Technical Writer for the relevant
[DevOps stage](https://about.gitlab.com/handbook/product/categories/#devops-stages)
in your issue or MR, or write within `#docs` on the GitLab Slack.
-- The docs should be merged with the code **by the feature freeze date**, otherwise
- the feature should not be included with the release. The PM can decide if a feature can ship without documentation. A policy for documenting feature-flagged
+- If you are working on documentation in a separate MR, ensure that if the code is merged by the 17th, the docs are as well, per the [Engineering Workflow](https://about.gitlab.com/handbook/engineering/workflow/). If the docs are not ready, the PM can approve merging the code if the engineer and tech writer commit to get documentation merged by the 21st. Otherwise the feature is not considered complete, and should not be merged.
+- A policy for documenting feature-flagged
issues is forthcoming and you are welcome to join the [discussion](https://gitlab.com/gitlab-org/gitlab-ce/issues/56813).
#### Reviews and merging