Commit 6cb4e488 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'checkout_schema.rb' into 'master'

Clear changes to schema.rb when upgrading

See merge request !1142
parents 3dde6bb3 b0400789
...@@ -69,6 +69,7 @@ sudo -u git -H git fetch --all ...@@ -69,6 +69,7 @@ sudo -u git -H git fetch --all
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
``` ```
...@@ -77,6 +78,7 @@ OR ...@@ -77,6 +78,7 @@ 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
``` ```
......
...@@ -23,6 +23,7 @@ sudo -u git -H git fetch --all ...@@ -23,6 +23,7 @@ sudo -u git -H git fetch --all
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
``` ```
...@@ -31,6 +32,7 @@ OR ...@@ -31,6 +32,7 @@ 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