diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-02-03 12:58:08 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-02-03 12:58:08 +0300 |
| commit | 2e056d5ee2396f420532216d676a39f05bc7aa84 (patch) | |
| tree | 9e1f592368c9035e42bc09006499f03ace43fa77 /doc | |
| parent | 8a85906a74aff295074c79619d491bea9c947e05 (diff) | |
| parent | e6cb010088c92a4c26fd2ac201944327369e7803 (diff) | |
Merge branch 'aral/gitlab-ce-master' into 'master'
Added note: working copy changes should be stashed before update process
Originally proposed by @aral in !1043.
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.
See merge request !2668
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/update/6.x-or-7.x-to-7.14.md | 6 |
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 |