diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-01 08:45:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-01 08:45:29 +0000 |
| commit | 6cb4e488ab0b04a9f06042c53ba96301b4f21bbe (patch) | |
| tree | 8182acee8ddf4f67751a88441e6403f6113e8cb8 | |
| parent | 3dde6bb3fa74238df0e1a2bbf4077852a9fd0bdb (diff) | |
| parent | b040078974c0226438109ae41418d978074976e0 (diff) | |
| download | gitlab-ce-6cb4e488ab0b04a9f06042c53ba96301b4f21bbe.tar.gz | |
Merge branch 'checkout_schema.rb' into 'master'
Clear changes to schema.rb when upgrading
See merge request !1142
| -rw-r--r-- | doc/update/6.x-or-7.x-to-7.3.md | 2 | ||||
| -rw-r--r-- | doc/update/7.2-to-7.3.md | 2 |
2 files changed, 4 insertions, 0 deletions
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 ``` |