Commit fe14384e authored by Robert Schilling's avatar Robert Schilling

Merge pull request #8021 from bbodenmiller/schema.rb

simplify schema.rb reset in upgrade guides
parents f7b19023 2b3090d9
...@@ -64,12 +64,12 @@ sudo gem install bundler --no-ri --no-rdoc ...@@ -64,12 +64,12 @@ sudo gem install bundler --no-ri --no-rdoc
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H git fetch --all 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: For GitLab Community Edition:
```bash ```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 sudo -u git -H git checkout 7-3-stable
``` ```
...@@ -78,7 +78,6 @@ OR ...@@ -78,7 +78,6 @@ OR
For GitLab Enterprise Edition: For GitLab Enterprise Edition:
```bash ```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 sudo -u git -H git checkout 7-3-stable-ee
``` ```
......
...@@ -18,12 +18,12 @@ sudo service gitlab stop ...@@ -18,12 +18,12 @@ sudo service gitlab stop
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H git fetch --all 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: For GitLab Community Edition:
```bash ```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 sudo -u git -H git checkout 7-3-stable
``` ```
...@@ -32,7 +32,6 @@ OR ...@@ -32,7 +32,6 @@ OR
For GitLab Enterprise Edition: For GitLab Enterprise Edition:
```bash ```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 sudo -u git -H git checkout 7-3-stable-ee
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment