diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-07-11 17:19:17 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-07-11 17:19:17 -0400 |
| commit | 0452e0a57e24fdd65f559cc1a8629892714adc7a (patch) | |
| tree | bf33ca472a3d434770783d80b5d10211383e706c /doc/ci | |
| parent | 7690513495d02d14af8a1a0cb3bf00f243ec0419 (diff) | |
| parent | f76596380fb545c54b14c6bfc339a68a1dc162d3 (diff) | |
| download | gitlab-ce-faster-diffs.tar.gz | |
Merge branch 'master' into faster-diffsfaster-diffs
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/examples/php.md | 2 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/examples/php.md b/doc/ci/examples/php.md index 17e1c64bb8a..bfafcc44d66 100644 --- a/doc/ci/examples/php.md +++ b/doc/ci/examples/php.md @@ -49,7 +49,7 @@ apt-get update -yqq apt-get install git -yqq # Install phpunit, the tool that we will use for testing -curl -o /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar +curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar chmod +x /usr/local/bin/phpunit # Install mysql driver diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index d2d1b04f893..16a1461a7e4 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -133,7 +133,7 @@ builds, including deploy builds. This can be an array or a multi-line string. ### after_script >**Note:** -Introduced in GitLab 8.7 and requires Gitlab Runner v1.2 (not yet released) +Introduced in GitLab 8.7 and requires Gitlab Runner v1.2 `after_script` is used to define the command that will be run after for all builds. This has to be an array or a multi-line string. @@ -811,7 +811,7 @@ deploy: It's possible to overwrite globally defined `before_script` and `after_script`: ```yaml -before_script +before_script: - global before script job: |