diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-12-07 10:27:32 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-12-07 10:27:32 +0000 |
commit | 9f8a389ac6c2065e8b4fdf174af18c93ba398d25 (patch) | |
tree | 1daa1666d9420c0af61837ce90e043c3e3b37799 /doc | |
parent | 51d269f8b36fd8dd897e32f767af29f4eca3b1f6 (diff) | |
parent | 48d89919e6a0eebc43780c41a4d789cdcb716bb5 (diff) | |
download | gitlab-ce-9f8a389ac6c2065e8b4fdf174af18c93ba398d25.tar.gz |
Merge branch 'patch-7' into 'master'
Update php.md - /.dockerinit was removed in v1.11 so the test always results in …
See merge request !7882
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/examples/php.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/examples/php.md b/doc/ci/examples/php.md index 175e9d79904..82ffb841729 100644 --- a/doc/ci/examples/php.md +++ b/doc/ci/examples/php.md @@ -40,7 +40,7 @@ repository with the following content: #!/bin/bash # We need to install dependencies only for Docker -[[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0 +[[ ! -e /.dockerenv ]] && exit 0 set -xe |