Add latest changes from gitlab-org/gitlab@master

5 files changed, 18 insertions, 7 deletions

diff --git a/doc/ci/junit_test_reports.md b/doc/ci/junit_test_reports.md
index 78c9965aa08..313ade0887e 100644
--- a/doc/ci/junit_test_reports.md
+++ b/doc/ci/junit_test_reports.md
@@ -151,6 +151,21 @@ java:
         - target/failsafe-reports/TEST-*.xml
 ```
 
+### Python example
+
+This example uses pytest with the `--junitxml=report.xml` flag to format the output
+for JUnit:
+
+```yaml
+pytest:
+  stage: test
+  script:
+  - pytest --junitxml=report.xml
+  artifacts:
+    reports:
+      junit: report.xml
+```
+
 ### C/C++ example
 
 There are a few tools that can produce JUnit reports in C/C++.
diff --git a/doc/ci/multi_project_pipelines.md b/doc/ci/multi_project_pipelines.md
index 7c79bf350b9..14277b6b55b 100644
--- a/doc/ci/multi_project_pipelines.md
+++ b/doc/ci/multi_project_pipelines.md
@@ -10,8 +10,6 @@ type: reference
 You can set up [GitLab CI/CD](README.md) across multiple projects, so that a pipeline
 in one project can trigger a pipeline in another project.
 
-## Overview
-
 GitLab CI/CD is a powerful continuous integration tool that works not only per project,
 but also across projects with multi-project pipelines.
 
diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md
index 28c587f39bb..18f5c5f6827 100644
--- a/doc/ci/pipelines/index.md
+++ b/doc/ci/pipelines/index.md
@@ -12,8 +12,6 @@ Watch our
 ["Mastering continuous software development"](https://about.gitlab.com/webcast/mastering-ci-cd/)
 webcast to see a comprehensive demo of GitLab CI/CD pipeline.
 
-## Introduction
-
 Pipelines are the top-level component of continuous integration, delivery, and deployment.
 
 Pipelines comprise:
@@ -33,7 +31,7 @@ If you have a [mirrored repository that GitLab pulls from](../../user/project/re
 you may need to enable pipeline triggering in your project's
 **Settings > Repository > Pull from a remote repository > Trigger pipelines for mirror updates**.
 
-### Simple pipeline example
+## Simple pipeline example
 
 As an example, imagine a pipeline consisting of four stages, executed in the following order:
 
diff --git a/doc/ci/pipelines/job_artifacts.md b/doc/ci/pipelines/job_artifacts.md
index d44df8defcf..ed791ea9c4a 100644
--- a/doc/ci/pipelines/job_artifacts.md
+++ b/doc/ci/pipelines/job_artifacts.md
@@ -3,7 +3,7 @@ disqus_identifier: 'https://docs.gitlab.com/ee/user/project/pipelines/job_artifa
 type: reference, howto
 ---
 
-# Introduction to job artifacts
+# Job artifacts
 
 > - Introduced in GitLab 8.2 and GitLab Runner 0.7.0.
 > - Starting with GitLab 8.4 and GitLab Runner 1.0, the artifacts archive format changed to `ZIP`, and it is now possible to browse its contents, with the added ability of downloading the files separately.
diff --git a/doc/ci/pipelines/settings.md b/doc/ci/pipelines/settings.md
index 48862986114..b1c5ee6e24f 100644
--- a/doc/ci/pipelines/settings.md
+++ b/doc/ci/pipelines/settings.md
@@ -3,7 +3,7 @@ disqus_identifier: 'https://docs.gitlab.com/ee/user/project/pipelines/settings.h
 type: reference, howto
 ---
 
-# Pipelines settings
+# Pipeline settings
 
 To reach the pipelines settings navigate to your project's
 **Settings > CI/CD**.