summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <marcia@gitlab.com>2019-03-13 18:12:10 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-03-13 18:12:10 +0000
commit9fa32e8671be7cc95de4471feaed81728a0dce66 (patch)
treedaf1e7cb499c96f04fd243335365fc8467cc2b6f
parentc048422fa23b988ecdb87858cd58766870347bbe (diff)
parent587e30d0497bb38f237483eeaa43c6d05cdf7d18 (diff)
downloadgitlab-ce-9fa32e8671be7cc95de4471feaed81728a0dce66.tar.gz
Merge branch 'patch-48' into 'master'
Fix bug "Fatal: Could not parse object {COMMIT_HASH}" See merge request gitlab-org/gitlab-ce!25860
-rw-r--r--doc/ci/examples/laravel_with_gitlab_and_envoy/index.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md
index 183ed20071f..0f809ed05ca 100644
--- a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md
+++ b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md
@@ -269,7 +269,7 @@ The `releases` directory will hold all our deployments:
echo 'Cloning repository'
[ -d {{ $releases_dir }} ] || mkdir {{ $releases_dir }}
git clone --depth 1 {{ $repository }} {{ $new_release_dir }}
- cd {{ $releases_dir }}
+ cd {{ $new_release_dir }}
git reset --hard {{ $commit }}
@endtask
@@ -347,7 +347,7 @@ At the end, our `Envoy.blade.php` file will look like this:
echo 'Cloning repository'
[ -d {{ $releases_dir }} ] || mkdir {{ $releases_dir }}
git clone --depth 1 {{ $repository }} {{ $new_release_dir }}
- cd {{ $releases_dir }}
+ cd {{ $new_release_dir }}
git reset --hard {{ $commit }}
@endtask