summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAral Balkan <aral@aralbalkan.com>2015-07-25 10:39:49 +0000
committerRémy Coutable <remy@rymai.me>2016-02-01 17:11:25 +0100
commite6cb010088c92a4c26fd2ac201944327369e7803 (patch)
tree00e9485ee6b0802168160ebe7a0e377f67ecc9ee
parentda8e0f86595299740a344309cb5963854b61c4a6 (diff)
downloadgitlab-ce-aral/gitlab-ce-master.tar.gz
Added note: working copy changes (e.g., deleted vendor folder) should be stashed before beginning the update process. We should probably include this notice on all update guides.aral/gitlab-ce-master
[ci skip]
-rw-r--r--doc/update/6.x-or-7.x-to-7.14.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/update/6.x-or-7.x-to-7.14.md b/doc/update/6.x-or-7.x-to-7.14.md
index 4516a102084..c45fc9340ea 100644
--- a/doc/update/6.x-or-7.x-to-7.14.md
+++ b/doc/update/6.x-or-7.x-to-7.14.md
@@ -14,6 +14,12 @@ possible to edit the label text and color. The characters `?`, `&` and `,` are
no longer allowed however so those will be removed from your tags during the
database migrations for GitLab 7.2.
+## Stash changes
+
+If you [deleted the vendors folder during your original installation](https://github.com/gitlabhq/gitlabhq/issues/4883#issuecomment-31108431), [you will get an error](https://gitlab.com/gitlab-org/gitlab-ce/issues/1494) when you attempt to rebuild the assets in step 7. To avoid this, stash the changes in your GitLab working copy before starting:
+
+ git stash
+
## 0. Stop server
sudo service gitlab stop