diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-17 16:32:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-17 16:32:12 +0000 |
| commit | d2d632544cc8e9a2504f1c6790c5ec6d451d29a2 (patch) | |
| tree | d75f3a9402161817da22fe12cd55d8ba66214188 | |
| parent | 7dd7ffc17babc1500af73ad194349cd5f4074210 (diff) | |
| parent | f98c2cf17f614111f623ace99042998480521424 (diff) | |
| download | gitlab-ce-d2d632544cc8e9a2504f1c6790c5ec6d451d29a2.tar.gz | |
Merge branch 'patch-14' into 'master'
Update gitlab_flow.md. Insert missing word on line 70.
See merge request !9334
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index c228ea72f22..4889e3ec50c 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -67,7 +67,7 @@ With GitLab flow we offer additional guidance for these questions.  GitHub flow does assume you are able to deploy to production every time you merge a feature branch. -This is possible for SaaS applications but are many cases where this is not possible. +This is possible for SaaS applications but there are many cases where this is not possible. One would be a situation where you are not in control of the exact release moment, for example an iOS application that needs to pass App Store validation. Another example is when you have deployment windows (workdays from 10am to 4pm when the operations team is at full capacity) but you also merge code at other times. In these cases you can make a production branch that reflects the deployed code. |