From b040078974c0226438109ae41418d978074976e0 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 1 Oct 2014 10:41:20 +0200 Subject: [PATCH] Clear changes to schema.rb when upgrading Having local changes is quite common and it is a stumbling block when upgrading GitLab. Because schema.rb is generated from the actual DB schema it is OK to clear the local changes. --- doc/update/6.x-or-7.x-to-7.3.md | 2 ++ doc/update/7.2-to-7.3.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/doc/update/6.x-or-7.x-to-7.3.md b/doc/update/6.x-or-7.x-to-7.3.md index a0e21950c78..171fcb4033a 100644 --- a/doc/update/6.x-or-7.x-to-7.3.md +++ b/doc/update/6.x-or-7.x-to-7.3.md @@ -69,6 +69,7 @@ sudo -u git -H git fetch --all For GitLab Community Edition: ```bash +sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically sudo -u git -H git checkout 7-3-stable ``` @@ -77,6 +78,7 @@ OR For GitLab Enterprise Edition: ```bash +sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically sudo -u git -H git checkout 7-3-stable-ee ``` diff --git a/doc/update/7.2-to-7.3.md b/doc/update/7.2-to-7.3.md index d85e3ea1006..329b763322a 100644 --- a/doc/update/7.2-to-7.3.md +++ b/doc/update/7.2-to-7.3.md @@ -23,6 +23,7 @@ sudo -u git -H git fetch --all For GitLab Community Edition: ```bash +sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically sudo -u git -H git checkout 7-3-stable ``` @@ -31,6 +32,7 @@ OR For GitLab Enterprise Edition: ```bash +sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically sudo -u git -H git checkout 7-3-stable-ee ``` -- GitLab