Commit 1ced84fe authored by Nick Thomas's avatar Nick Thomas

Resolve conflicts in .gitlab-ci.yml

parent 1d156dde
...@@ -472,27 +472,6 @@ lint:javascript:report: ...@@ -472,27 +472,6 @@ lint:javascript:report:
paths: paths:
- eslint-report.html - eslint-report.html
<<<<<<< HEAD
# Trigger docs build
# https://gitlab.com/gitlab-com/doc-gitlab-com/blob/master/README.md#deployment-process
trigger_docs:
stage: post-test
image: "alpine"
<<: *dedicated-runner
before_script:
- apk update && apk add curl
variables:
GIT_STRATEGY: "none"
cache: {}
artifacts: {}
script:
- "HTTP_STATUS=$(curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=${CI_PROJECT_NAME} --silent --output curl.log --write-out '%{http_code}' https://gitlab.com/api/v3/projects/1794617/trigger/builds)"
- if [ "${HTTP_STATUS}" -ne "201" ]; then echo "Error ${HTTP_STATUS}"; cat curl.log; echo; exit 1; fi
only:
- master@gitlab-org/gitlab-ee
=======
>>>>>>> ce-com/master
pages: pages:
before_script: [] before_script: []
stage: pages stage: pages
......
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