Fix CE to EE merge conflicts

doc/ci/examples/browser_performance.md

@@ -41,11 +41,7 @@ The above example will create a `performance` job in your CI/CD pipeline and wil
 Sitespeed.io against the webpage you defined in `URL` to gather key metrics.
 The [GitLab plugin](https://gitlab.com/gitlab-org/gl-performance) for
 Sitespeed.io is downloaded in order to save the report as a
-<<<<<<< HEAD
 [Performance report artifact](../../ci/yaml/README.md#artifactsreportsperformance)
-=======
-[Performance report artifact](https://docs.gitlab.com/ee//ci/yaml/README.html#artifactsreportsperformance)
->>>>>>> upstream/master
 that you can later download and analyze.
 Due to implementation limitations we always take the latest Performance artifact available.
 
@@ -59,13 +55,8 @@ provide a list of URLs to test, please consult
 
 TIP: **Tip:**
 For [GitLab Premium](https://about.gitlab.com/pricing/) users, key metrics are automatically
-<<<<<<< HEAD
-extracted and shown right in the merge request widget. Learn more about
-[Browser Performance Testing](../../user/project/merge_requests/browser_performance_testing.md).
-=======
 extracted and shown right in the merge request widget.
-[Learn more on Browser Performance Testing in merge requests](https://docs.gitlab.com/ee//user/project/merge_requests/browser_performance_testing.html).
->>>>>>> upstream/master
+[Learn more on Browser Performance Testing in merge requests](../../user/project/merge_requests/browser_performance_testing.md).
 
 ## Performance testing on Review Apps
 

doc/ci/examples/code_quality.md

@@ -43,14 +43,8 @@ Due to implementation limitations we always take the latest Code Quality artifac
 TIP: **Tip:**
 For [GitLab Starter][ee] users, this information will be automatically
 extracted and shown right in the merge request widget.
-<<<<<<< HEAD
 [Learn more on Code Quality in merge requests](../../user/project/merge_requests/code_quality.html).
 
-## Previous job definitions
-=======
-[Learn more on Code Quality in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/code_quality.html).
->>>>>>> upstream/master
-
 ## Previous job definitions
 
 CAUTION: **Caution:**
@@ -81,16 +75,10 @@ code_quality:
       paths: [gl-code-quality-report.json]
 ```
 
-<<<<<<< HEAD
-Alternatively the job name could be `codeclimate` or `codequality` and the artifact name could be
-`codeclimate.json`. These names have been deprecated with GitLab 11.0 and may be removed
-in next major release, GitLab 12.0.
-=======
 Alternatively the job name could be `codeclimate` or `codequality`
 and the artifact name could be `codeclimate.json`.
 These names have been deprecated with GitLab 11.0
 and may be removed in next major release, GitLab 12.0.
->>>>>>> upstream/master
 
 For GitLab 10.3 and earlier, the job should look like:
 

doc/ci/examples/container_scanning.md

@@ -51,11 +51,7 @@ The above example will create a `container_scanning` job in your CI/CD pipeline,
 the image from the [Container Registry](../../user/project/container_registry.md)
 (whose name is defined from the two `CI_APPLICATION_` variables) and scan it
 for possible vulnerabilities. The report will be saved as a
-<<<<<<< HEAD
 [Container Scanning report artifact](../../ci/yaml/README.md#artifactsreportscontainer_scanning)
-=======
-[Container Scanning report artifact](https://docs.gitlab.com/ee//ci/yaml/README.html#artifactsreportscontainer_scanning)
->>>>>>> upstream/master
 that you can later download and analyze.
 Due to implementation limitations we always take the latest Container Scanning artifact available.
 
@@ -66,11 +62,7 @@ in our case its named `clair-whitelist.yml`.
 TIP: **Tip:**
 For [GitLab Ultimate][ee] users, this information will
 be automatically extracted and shown right in the merge request widget.
-<<<<<<< HEAD
 [Learn more on Container Scanning in merge requests](../../user/project/merge_requests/container_scanning.html).
-=======
-[Learn more on Container Scanning in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/container_scanning.html).
->>>>>>> upstream/master
 
 CAUTION: **Caution:**
 Starting with GitLab 11.5, Container Scanning feature is licensed under the name `container_scanning`.

doc/ci/examples/dast.md

@@ -17,11 +17,7 @@ It can be very useful combined with [Review Apps](../review_apps/index.md).
 ## Example
 
 First, you need GitLab Runner with
-<<<<<<< HEAD
 [docker executor](https://docs.gitlab.com/runner/executors/docker.html).
-=======
-[docker-in-docker executor](../docker/using_docker_build.md#use-docker-in-docker-executor).
->>>>>>> upstream/master
 
 Once you set up the Runner, add a new job to `.gitlab-ci.yml` that
 generates the expected report:
@@ -44,11 +40,7 @@ dast:
 The above example will create a `dast` job in your CI/CD pipeline which will run
 the tests on the URL defined in the `website` variable (change it to use your
 own) and scan it for possible vulnerabilities. The report will be saved as a
-<<<<<<< HEAD
 [DAST report artifact](../../ci/yaml/README.md#artifactsreportsdast)
-=======
-[DAST report artifact](https://docs.gitlab.com/ee//ci/yaml/README.html#artifactsreportsdast)
->>>>>>> upstream/master
 that you can later download and analyze.
 Due to implementation limitations we always take the latest DAST artifact available.
 
@@ -80,11 +72,7 @@ to learn more about authentication settings.
 TIP: **Tip:**
 For [GitLab Ultimate][ee] users, this information will
 be automatically extracted and shown right in the merge request widget.
-<<<<<<< HEAD
 [Learn more on DAST in merge requests](../../user/project/merge_requests/dast.md).
-=======
-[Learn more on DAST in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/dast.html).
->>>>>>> upstream/master
 
 ## Previous job definitions
 

doc/ci/yaml/README.md

@@ -1337,11 +1337,7 @@ concatenated into a single file. Use a filename pattern (`junit: rspec-*.xml`),
 an array of filenames (`junit: [rspec-1.xml, rspec-2.xml, rspec-3.xml]`), or a
 combination thereof (`junit: [rspec.xml, test-results/TEST-*.xml]`).
 
-<<<<<<< HEAD
-#### `artifacts:reports:codequality`
-=======
 #### `artifacts:reports:codequality` **[STARTER]**
->>>>>>> upstream/master
 
 > Introduced in GitLab 11.5. Requires GitLab Runner 11.5 and above.
 
@@ -1351,11 +1347,7 @@ as artifacts.
 The collected Code Quality report will be uploaded to GitLab as an artifact and will
 be automatically shown in merge requests.
 
-<<<<<<< HEAD
-#### `artifacts:reports:sast`
-=======
 #### `artifacts:reports:sast` **[ULTIMATE]**
->>>>>>> upstream/master
 
 > Introduced in GitLab 11.5. Requires GitLab Runner 11.5 and above.
 
@@ -1366,11 +1358,7 @@ The collected SAST report will be uploaded to GitLab as an artifact and will
 be automatically shown in merge requests, pipeline view and provide data for security
 dashboards.
 
-<<<<<<< HEAD
-#### `artifacts:reports:dependency_scanning`
-=======
 #### `artifacts:reports:dependency_scanning` **[ULTIMATE]**
->>>>>>> upstream/master
 
 > Introduced in GitLab 11.5. Requires GitLab Runner 11.5 and above.
 
@@ -1381,11 +1369,7 @@ The collected Dependency Scanning report will be uploaded to GitLab as an artifa
 be automatically shown in merge requests, pipeline view and provide data for security
 dashboards.
 
-<<<<<<< HEAD
-#### `artifacts:reports:container_scanning`
-=======
 #### `artifacts:reports:container_scanning` **[ULTIMATE]**
->>>>>>> upstream/master
 
 > Introduced in GitLab 11.5. Requires GitLab Runner 11.5 and above.
 
@@ -1396,11 +1380,7 @@ The collected Container Scanning report will be uploaded to GitLab as an artifac
 be automatically shown in merge requests, pipeline view and provide data for security
 dashboards.
 
-<<<<<<< HEAD
-#### `artifacts:reports:dast`
-=======
 #### `artifacts:reports:dast` **[ULTIMATE]**
->>>>>>> upstream/master
 
 > Introduced in GitLab 11.5. Requires GitLab Runner 11.5 and above.
 
@@ -1411,11 +1391,7 @@ The collected DAST report will be uploaded to GitLab as an artifact and will
 be automatically shown in merge requests, pipeline view and provide data for security
 dashboards.
 
-<<<<<<< HEAD
-#### `artifacts:reports:license_management`
-=======
 #### `artifacts:reports:license_management` **[ULTIMATE]**
->>>>>>> upstream/master
 
 > Introduced in GitLab 11.5. Requires GitLab Runner 11.5 and above.
 
@@ -1426,11 +1402,7 @@ The collected License Management report will be uploaded to GitLab as an artifac
 be automatically shown in merge requests, pipeline view and provide data for security
 dashboards.
 
-<<<<<<< HEAD
-#### `artifacts:reports:performance`
-=======
 #### `artifacts:reports:performance` **[PREMIUM]**
->>>>>>> upstream/master
 
 > Introduced in GitLab 11.5. Requires GitLab Runner 11.5 and above.