Automatic merge of gitlab-org/gitlab-ce master

doc/ci/introduction/index.md

@@ -144,7 +144,6 @@ so, GitLab CI/CD:
 
 - Runs automated scripts (sequential or parallel) to:
   - Build and test your app.
-  - Deploy to a staging environment.
   - Preview the changes per merge request with Review Apps, as you
   would see in your `localhost`.
 
@@ -155,6 +154,8 @@ Once you're happy with your implementation:
   - GitLab CI/CD deploys your changes automatically to a production environment.
 -  And finally, you and your team can easily roll it back if something goes wrong.
 
+<img src="img/gitlab_workflow_example.png" alt="GitLab workflow example" class="image-noshadow">
+
 GitLab CI/CD is capable of a doing a lot more, but this workflow
 exemplifies GitLab's ability to track the entire process,
 without the need of any external tool to deliver your software.

doc/workflow/repository_mirroring.md

@@ -408,3 +408,11 @@ settings are recommended:
   Perforce Helix.
 
 Read about [Git Fusion settings on Perforce.com](https://www.perforce.com/perforce/doc.current/manuals/git-fusion/Content/Git-Fusion/section_vss_bdw_w3.html#section_zdp_zz1_3l).
+
+## Troubleshooting
+
+Should an error occur during a push, GitLab will display an "Error" highlight for that repository. Details on the error can then be seen by hovering over the highlight text.
+
+### 13:Received RST_STREAM with error code 2 with GitHub
+
+If you receive an "13:Received RST_STREAM with error code 2" while mirroring to a GitHub repository, your GitHub settings might be set to block pushes that expose your email address used in commits. Either set your email address on GitHub to be public, or disable the [Block command line pushes that expose my email](http://github.com/settings/emails) setting.