Commit 66c76053 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rs-rc1-docs' into 'master'

8.2.rc1 documentation updates

[ci skip]

See merge request !1798
parents 43d5eca0 47b4b91e
...@@ -128,11 +128,10 @@ Install the Bundler Gem: ...@@ -128,11 +128,10 @@ Install the Bundler Gem:
## 3. Go ## 3. Go
Since GitLab 8.0, Git HTTP requests are handled by gitlab-git-http-server. Since GitLab 8.0, Git HTTP requests are handled by gitlab-workhorse (formerly
This is a small daemon written in Go. gitlab-git-http-server). This is a small daemon written in Go. To install
To install gitlab-git-http-server we need a Go compiler. gitlab-workhorse we need a Go compiler. The instructions below assume you
The instructions below assume you use 64-bit Linux. You can find use 64-bit Linux. You can find downloads for other platforms at the [Go download
downloads for other platforms at the [Go download
page](https://golang.org/dl). page](https://golang.org/dl).
curl -O --progress https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz curl -O --progress https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz
...@@ -211,9 +210,9 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da ...@@ -211,9 +210,9 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
### Clone the Source ### Clone the Source
# Clone GitLab repository # Clone GitLab repository
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-1-stable gitlab sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-2-stable gitlab
**Note:** You can change `8-1-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! **Note:** You can change `8-2-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
### Configure It ### Configure It
...@@ -323,16 +322,16 @@ GitLab Shell is an SSH access and repository management software developed speci ...@@ -323,16 +322,16 @@ GitLab Shell is an SSH access and repository management software developed speci
**Note:** Make sure your hostname can be resolved on the machine itself by either a proper DNS record or an additional line in /etc/hosts ("127.0.0.1 hostname"). This might be necessary for example if you set up gitlab behind a reverse proxy. If the hostname cannot be resolved, the final installation check will fail with "Check GitLab API access: FAILED. code: 401" and pushing commits will be rejected with "[remote rejected] master -> master (hook declined)". **Note:** Make sure your hostname can be resolved on the machine itself by either a proper DNS record or an additional line in /etc/hosts ("127.0.0.1 hostname"). This might be necessary for example if you set up gitlab behind a reverse proxy. If the hostname cannot be resolved, the final installation check will fail with "Check GitLab API access: FAILED. code: 401" and pushing commits will be rejected with "[remote rejected] master -> master (hook declined)".
### Install gitlab-git-http-server ### Install gitlab-workhorse
cd /home/git cd /home/git
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-git-http-server.git sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git
cd gitlab-git-http-server cd gitlab-workhorse
sudo -u git -H git checkout 0.3.0 sudo -u git -H git checkout 0.4.1
sudo -u git -H make sudo -u git -H make
### Initialize Database and Activate Advanced Features ### Initialize Database and Activate Advanced Features
# Go to Gitlab installation folder # Go to Gitlab installation folder
cd /home/git/gitlab cd /home/git/gitlab
......
...@@ -37,9 +37,9 @@ template are explained below: ...@@ -37,9 +37,9 @@ template are explained below:
### Xth: (6 working days before the 22nd) ### Xth: (6 working days before the 22nd)
- [ ] Merge CE `master` into EE `master` via merge request (#LINK)
- [ ] Determine QA person and notify this person - [ ] Determine QA person and notify this person
- [ ] Check the tasks in [how to rc1 guide](https://dev.gitlab.org/gitlab/gitlabhq/blob/master/doc/release/howto_rc1.md) and delegate tasks if necessary - [ ] Check the tasks in [how to rc1 guide](https://dev.gitlab.org/gitlab/gitlabhq/blob/master/doc/release/howto_rc1.md) and delegate tasks if necessary
- [ ] Merge CE `master` into EE `master` via merge request (#LINK)
- [ ] Create CE and EE RC1 versions (#LINK) - [ ] Create CE and EE RC1 versions (#LINK)
- [ ] Build RC1 packages - [ ] Build RC1 packages
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
**NOTE:** GitLab 8.0 introduced several significant changes related to **NOTE:** GitLab 8.0 introduced several significant changes related to
installation and configuration which *are not duplicated here*. Be sure you're installation and configuration which *are not duplicated here*. Be sure you're
already running a working version of 8.0 before proceeding with this guide. already running a working version of at least 8.0 before proceeding with this
guide.
### 0. Double-check your Git version ### 0. Double-check your Git version
...@@ -67,7 +68,7 @@ sudo -u git -H git checkout 8-2-stable-ee ...@@ -67,7 +68,7 @@ sudo -u git -H git checkout 8-2-stable-ee
```bash ```bash
cd /home/git/gitlab-shell cd /home/git/gitlab-shell
sudo -u git -H git fetch sudo -u git -H git fetch
sudo -u git -H git checkout v2.6.5 sudo -u git -H git checkout v2.6.6
``` ```
### 5. Replace gitlab-git-http-server with gitlab-workhorse ### 5. Replace gitlab-git-http-server with gitlab-workhorse
...@@ -80,7 +81,7 @@ from GitLab 8.1. ...@@ -80,7 +81,7 @@ from GitLab 8.1.
cd /home/git cd /home/git
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git
cd gitlab-workhorse cd gitlab-workhorse
sudo -u git -H git checkout 0.3.1 sudo -u git -H git checkout 0.4.1
sudo -u git -H make sudo -u git -H make
``` ```
...@@ -165,12 +166,12 @@ To make sure you didn't miss anything run a more thorough check: ...@@ -165,12 +166,12 @@ To make sure you didn't miss anything run a more thorough check:
If all items are green, then congratulations, the upgrade is complete! If all items are green, then congratulations, the upgrade is complete!
## Things went south? Revert to previous version (8.0) ## Things went south? Revert to previous version (8.1)
### 1. Revert the code to the previous version ### 1. Revert the code to the previous version
Follow the [upgrade guide from 7.14 to 8.0](7.14-to-8.0.md), except for the database migration Follow the [upgrade guide from 8.0 to 8.1](8.0-to-8.1.md), except for the
(The backup is already migrated to the previous version) database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup ### 2. Restore from the backup
......
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