Commit 34e61145 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'update_documentation' into 'master'

Update upgrade guide for 6.4-6.5

This makes the checkout command more clear because previously it was within a comment.

/cc @job @sytse
parents f974bea8 1c629b62
...@@ -27,7 +27,20 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ...@@ -27,7 +27,20 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H git fetch sudo -u git -H git fetch --all
```
For Gitlab Community Edition:
```bash
sudo -u git -H git checkout 6-1-stable
```
OR
For GitLab Enterprise Edition:
```bash
sudo -u git -H git checkout 6-1-stable-ee sudo -u git -H git checkout 6-1-stable-ee
``` ```
......
...@@ -28,8 +28,20 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ...@@ -28,8 +28,20 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H git fetch --all sudo -u git -H git fetch --all
```
For Gitlab Community Edition:
```bash
sudo -u git -H git checkout 6-5-stable sudo -u git -H git checkout 6-5-stable
# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-5-stable-ee ```
OR
For GitLab Enterprise Edition:
```bash
sudo -u git -H git checkout 6-5-stable-ee
``` ```
......
...@@ -20,7 +20,20 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ...@@ -20,7 +20,20 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H git fetch sudo -u git -H git fetch --all
```
For Gitlab Community Edition:
```bash
sudo -u git -H git checkout 6-2-stable
```
OR
For GitLab Enterprise Edition:
```bash
sudo -u git -H git checkout 6-2-stable-ee sudo -u git -H git checkout 6-2-stable-ee
``` ```
......
...@@ -20,10 +20,23 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ...@@ -20,10 +20,23 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H git fetch sudo -u git -H git fetch --all
```
For Gitlab Community Edition:
```bash
sudo -u git -H git checkout 6-3-stable sudo -u git -H git checkout 6-3-stable
``` ```
OR
For GitLab Enterprise Edition:
```bash
sudo -u git -H git checkout 6-3-stable-ee
```
### 3. Update gitlab-shell (and its config) ### 3. Update gitlab-shell (and its config)
```bash ```bash
......
...@@ -15,10 +15,23 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ...@@ -15,10 +15,23 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H git fetch sudo -u git -H git fetch --all
```
For Gitlab Community Edition:
```bash
sudo -u git -H git checkout 6-4-stable sudo -u git -H git checkout 6-4-stable
``` ```
OR
For GitLab Enterprise Edition:
```bash
sudo -u git -H git checkout 6-4-stable-ee
```
### 3. Update gitlab-shell (and its config) ### 3. Update gitlab-shell (and its config)
```bash ```bash
......
...@@ -16,8 +16,20 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ...@@ -16,8 +16,20 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H git fetch --all sudo -u git -H git fetch --all
```
For Gitlab Community Edition:
```bash
sudo -u git -H git checkout 6-5-stable sudo -u git -H git checkout 6-5-stable
# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-5-stable-ee ```
OR
For GitLab Enterprise Edition:
```bash
sudo -u git -H git checkout 6-5-stable-ee
``` ```
### 3. Update gitlab-shell (and its config) ### 3. Update gitlab-shell (and its config)
......
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