summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-12-25 12:50:05 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-12-25 12:50:05 +0000
commit5e6dd15a996f57d7a8760f4c9c1dbd7beeeaadff (patch)
treeaa4b74b3c957177d625dc472150da01e606b4cdc
parent87bae6d42f7e562dc322b4913aa7160058d0608b (diff)
parent0960c703c0a7e37c2177aaf32b64c316f531fe15 (diff)
downloadgitlab-ce-5e6dd15a996f57d7a8760f4c9c1dbd7beeeaadff.tar.gz
Merge branch 'patch-28' into 'master'
Update code_climate recommended usage. See merge request gitlab-org/gitlab-ce!16101
-rw-r--r--doc/ci/examples/code_climate.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/ci/examples/code_climate.md b/doc/ci/examples/code_climate.md
index 4d0ba8bfef3..6a5821762cc 100644
--- a/doc/ci/examples/code_climate.md
+++ b/doc/ci/examples/code_climate.md
@@ -16,8 +16,7 @@ codequality:
- docker:dind
script:
- docker pull codeclimate/codeclimate
- - docker run --env CODECLIMATE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc codeclimate/codeclimate init
- - docker run --env CODECLIMATE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc codeclimate/codeclimate analyze -f json > codeclimate.json
+ - docker run --env CODECLIMATE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc codeclimate/codeclimate analyze -f json > codeclimate.json || true
artifacts:
paths: [codeclimate.json]
```