diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-10-13 08:22:19 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-10-13 08:22:19 +0200 |
| commit | fe14384e27b28ab9e6bde4fcee0fac744c938913 (patch) | |
| tree | 7972832c70fe5ab5feed88d0fdbcb2270e6bfba1 | |
| parent | f7b19023b1e917ce9ca422bc386b239eb470d37b (diff) | |
| parent | 2b3090d91b6d508cb88feab9c4d32791566bab63 (diff) | |
| download | gitlab-ce-fe14384e27b28ab9e6bde4fcee0fac744c938913.tar.gz | |
Merge pull request #8021 from bbodenmiller/schema.rb
simplify schema.rb reset in upgrade guides
| -rw-r--r-- | doc/update/6.x-or-7.x-to-7.3.md | 3 | ||||
| -rw-r--r-- | doc/update/7.2-to-7.3.md | 3 |
2 files changed, 2 insertions, 4 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 171fcb4033a..fe3530ef9c1 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 @@ -64,12 +64,12 @@ sudo gem install bundler --no-ri --no-rdoc ```bash cd /home/git/gitlab sudo -u git -H git fetch --all +sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically ``` 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 ``` @@ -78,7 +78,6 @@ 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 329b763322a..44f3f8f1a38 100644 --- a/doc/update/7.2-to-7.3.md +++ b/doc/update/7.2-to-7.3.md @@ -18,12 +18,12 @@ sudo service gitlab stop ```bash cd /home/git/gitlab sudo -u git -H git fetch --all +sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically ``` 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 ``` @@ -32,7 +32,6 @@ 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 ``` |