diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-21 11:10:02 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-21 11:10:02 +0000 |
commit | f4b4a34baa8f3df047556bc9a2e7b99326eec435 (patch) | |
tree | 2f1533ffa057d9ab7989d80fffcb0231999f3104 /.gitlab-ci.yml | |
parent | 2dc4eddf135fc473a0b2e2afc7176e6362397521 (diff) | |
parent | 4146be04482f27bc10246dd471c3f08ec258e0ed (diff) | |
download | gitlab-ce-f4b4a34baa8f3df047556bc9a2e7b99326eec435.tar.gz |
Merge branch 'master' into 27574-pipelines-empty-state
* master: (65 commits)
Merge branch 'render-json-leak' into 'security'
Merge branch 'ssrf' into 'security'
Merge branch 'ssrf' into 'security'
Merge branch 'fix-links-target-blank' into 'security'
Merge branch '28058-hide-emails-in-atom-feeds' into 'security'
Fix karma test
Reset filters after click
Handle Route#name being nil after an update
Only add frontend code coverage instrumentation when generating coverage report
fix recompile assets step in 9.0 upgrade guide to use yarn
Undo explicit conversion to Integer
Make level_value accept string integers
Make feature spec more robust
Removed d3.js from the main application.js bundle
Update css to be nice and tidy.
add an index to the ghost column
Improve rename projects migration
Add additional check for when inputContainer does not exist
Make the v3_to_v4.md more consistent
Fix input token spacing
...
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 080d8cd6c7f..34c10b3b77f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -277,6 +277,8 @@ rake karma: stage: test <<: *use-db <<: *dedicated-runner + variables: + BABEL_ENV: "coverage" script: - bundle exec rake karma artifacts: @@ -389,9 +391,11 @@ trigger_docs: cache: {} artifacts: {} script: - - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ce https://gitlab.com/api/v3/projects/1794617/trigger/builds" + - "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-ce + - master@gitlab-org/gitlab-ee # Notify slack in the end notify:slack: |