summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-06-06 08:50:44 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-06-06 08:50:44 +0000
commit59bd1d2cea15ea999c8ef451ac662816dadc2056 (patch)
treeb2873afa17c18593bad7a38dee08dafe6ac1e6df
parent1d847b48c66652983765d53ddfdcf19fc30cc920 (diff)
parent30f4f6b1fb8890e106883a84454121a56c9723e0 (diff)
downloadgitlab-ce-59bd1d2cea15ea999c8ef451ac662816dadc2056.tar.gz
Merge branch 'dz-backport-codeclimate-docs' into 'master'
Backport CI codeclimate example doc change from EE See merge request !11903
-rw-r--r--doc/ci/examples/code_climate.md12
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/ci/examples/code_climate.md b/doc/ci/examples/code_climate.md
index bd53f80ce14..a047e809788 100644
--- a/doc/ci/examples/code_climate.md
+++ b/doc/ci/examples/code_climate.md
@@ -1,11 +1,11 @@
# Analyze project code quality with Code Climate CLI
-This example shows how to run [Code Climate CLI][cli] on your code by using\
+This example shows how to run [Code Climate CLI][cli] on your code by using
GitLab CI and Docker.
-First, you need GitLab Runner with [docker-in-docker executor](../docker/using_docker_build.md#use-docker-in-docker-executor).
+First, you need GitLab Runner with [docker-in-docker executor][dind].
-Once you setup the Runner add new job to `.gitlab-ci.yml`:
+Once you set up the Runner, add a new job to `.gitlab-ci.yml`, called `codeclimate`:
```yaml
codeclimate:
@@ -25,4 +25,10 @@ codeclimate:
This will create a `codeclimate` job in your CI pipeline and will allow you to
download and analyze the report artifact in JSON format.
+For GitLab [Enterprise Edition Starter][ee] users, this information can be automatically
+extracted and shown right in the merge request widget. [Learn more on code quality
+diffs in merge requests](http://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.md).
+
[cli]: https://github.com/codeclimate/codeclimate
+[dind]: ../docker/using_docker_build.md#use-docker-in-docker-executor
+[ee]: https://about.gitlab.com/gitlab-ee/