diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-02 16:25:37 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-02 16:25:37 +0000 |
| commit | dc390c5ac250a3dd7e03b950c96be18905d6e51b (patch) | |
| tree | bce035cb45f913415ca084ffc46d34f60a20483a | |
| parent | 5af15baae6f75efabeb4f14a57b70a57f567f689 (diff) | |
| parent | e32eb5715141101a95e97c4f51a2f96976822c9a (diff) | |
| download | gitlab-ce-dc390c5ac250a3dd7e03b950c96be18905d6e51b.tar.gz | |
Merge branch 'patch-1' into 'master'
explicitly call script with bash for consistency
simpler than telling users to set script executable
[ci skip]
See merge request !2621
| -rw-r--r-- | doc/ci/languages/php.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/languages/php.md b/doc/ci/languages/php.md index 77f9fae5bb6..aeadd6a448e 100644 --- a/doc/ci/languages/php.md +++ b/doc/ci/languages/php.md @@ -97,7 +97,7 @@ image: php:5.6 before_script: # Install dependencies -- ci/docker_install.sh > /dev/null +- bash ci/docker_install.sh > /dev/null test:app: script: @@ -112,7 +112,7 @@ with a different docker image version and the runner will do the rest: ```yaml before_script: # Install dependencies -- ci/docker_install.sh > /dev/null +- bash ci/docker_install.sh > /dev/null # We test PHP5.6 test:5.6: |