Merge pull request #8021 from bbodenmiller/schema.rb

simplify schema.rb reset in upgrade guides
This commit is contained in:
Robert Schilling 2014-10-13 08:22:19 +02:00
commit fe14384e27
2 changed files with 2 additions and 4 deletions

View file

@ -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
```

View file

@ -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
```