Commit b76ac3ab authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Solve doc/ci/ conflicts

parent 6d278438
...@@ -30,10 +30,6 @@ Starting with [GitLab Enterprise Edition Ultimate][ee] 10.4, this information wi ...@@ -30,10 +30,6 @@ Starting with [GitLab Enterprise Edition Ultimate][ee] 10.4, this information wi
be automatically extracted and shown right in the merge request widget. To do be automatically extracted and shown right in the merge request widget. To do
so, the CI job must be named `dast` and the artifact path must be so, the CI job must be named `dast` and the artifact path must be
`gl-dast-report.json`. `gl-dast-report.json`.
<<<<<<< HEAD
[Learn more on dynamic application security testing results shown in merge requests](../../user/project/merge_requests/dast.md). [Learn more on dynamic application security testing results shown in merge requests](../../user/project/merge_requests/dast.md).
=======
[Learn more on dynamic application security testing results shown in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/dast.html).
>>>>>>> upstream/master
[ee]: https://about.gitlab.com/gitlab-ee/ [ee]: https://about.gitlab.com/gitlab-ee/
...@@ -50,10 +50,6 @@ Starting with [GitLab Enterprise Edition Ultimate][ee] 10.4, this information wi ...@@ -50,10 +50,6 @@ Starting with [GitLab Enterprise Edition Ultimate][ee] 10.4, this information wi
be automatically extracted and shown right in the merge request widget. To do be automatically extracted and shown right in the merge request widget. To do
so, the CI/CD job must be named `sast:container` and the artifact path must be so, the CI/CD job must be named `sast:container` and the artifact path must be
`gl-sast-container-report.json`. `gl-sast-container-report.json`.
<<<<<<< HEAD
[Learn more on application security testing results shown in merge requests](../../user/project/merge_requests/sast_docker.md). [Learn more on application security testing results shown in merge requests](../../user/project/merge_requests/sast_docker.md).
=======
[Learn more on application security testing results shown in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/sast_docker.html).
>>>>>>> upstream/master
[ee]: https://about.gitlab.com/gitlab-ee/ [ee]: https://about.gitlab.com/gitlab-ee/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment