diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-28 15:06:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-28 15:06:31 +0000 |
| commit | 4d69debcc7c9110af961f4fb5cbd3d07cb9e83a3 (patch) | |
| tree | 3f1bc38bc2eb1e856ddc7078e56b59bfe237c302 | |
| parent | ad6487cec8cf92f4484013014cda921606970a56 (diff) | |
| parent | 329391ced723a62b20d0ce9bb4746e0f4074f395 (diff) | |
| download | gitlab-ce-4d69debcc7c9110af961f4fb5cbd3d07cb9e83a3.tar.gz | |
Merge branch 'patch-24' into 'master'
Update gitlab_flow.md, Teatro seems to be completely dead, see also…
See merge request !13157
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index ea28968fbb2..9d466ae1971 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -91,7 +91,6 @@ This workflow where commits only flow downstream ensures that everything has bee If you need to cherry-pick a commit with a hotfix it is common to develop it on a feature branch and merge it into master with a merge request, do not delete the feature branch. If master is good to go (it should be if you are practicing [continuous delivery](http://martinfowler.com/bliki/ContinuousDelivery.html)) you then merge it to the other branches. If this is not possible because more manual testing is required you can send merge requests from the feature branch to the downstream branches. -An 'extreme' version of environment branches are setting up an environment for each feature branch as done by [Teatro](https://teatro.io/). ## Release branches with GitLab flow |