diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-23 11:48:53 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-23 11:48:53 +0000 |
| commit | 05c66406ca7e7f29b9b210fda9f31a60528917f1 (patch) | |
| tree | 18d7f553a61fea3c6a9655be16a4842478990284 /doc/workflow/gitlab_flow.md | |
| parent | 0f36cfd7f58977becea9d3ecf410d3669440fbe9 (diff) | |
| parent | f106ad513546c8d77b88a0a061a0b6a7e7ee26ed (diff) | |
| download | gitlab-ce-26900-pipelines-tabs.tar.gz | |
Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabs
* master: (361 commits)
Code style improvements
remove require.context from network_bundle
remove require.context from graphs_bundle
remove require.context from filtered_search_bundle
Ignore two Rails CVEs in bundler:audit job
Remove Pages readme
Change Pages redirect
Add missing index.md to Pages docs
Added double newline after file upload markdown insert
Reorder main index items in Pages overview
remove html comments
remove <>
wrapping text - part 3
wrapping text - part 2 [ci skip]
fix link
wrap text - part 1 - [ci skip]
typo
fix spelling, add intermediate cert link
Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag
remove link to unfinished video
...
Diffstat (limited to 'doc/workflow/gitlab_flow.md')
| -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. |