Merge branch 'docs/add_gitflow_video' into 'master'

Added link to GitFlow video

See merge request gitlab-org/gitlab-ce!29517

doc/gitlab-basics/README.md

@@ -24,6 +24,7 @@ The following are guides to basic GitLab functionality:
 - [Add an image](add-image.md), to add new images to a project's repository.
 - [Create an issue](../user/project/issues/create_new_issue.md), to start collaborating within a project.
 - [Create a merge request](add-merge-request.md), to request changes made in a branch be merged into a project's repository.
+- See how these features come together in the [GitLab Flow introduction video](https://youtu.be/InKNIvky2KE) and [GitLab Flow page](../workflow/gitlab_flow.md).
 
 ## Git basics
 

doc/workflow/gitlab_flow.md

@@ -27,6 +27,8 @@ People have a hard time figuring out which branch has the latest code, or which
 Frequently, the reaction to this problem is to adopt a standardized pattern such as [Git flow](https://nvie.com/posts/a-successful-git-branching-model/) and [GitHub flow](http://scottchacon.com/2011/08/31/github-flow.html).
 We think there is still room for improvement. In this document, we describe a set of practices we call GitLab flow.
 
+For a video introduction of how this works in GitLab, see [GitLab Flow](https://youtu.be/InKNIvky2KE).
+
 ## Git flow and its problems
 
 ![Git Flow timeline by Vincent Driessen, used with permission](gitdashflow.png)