Skip to content
Snippets Groups Projects
Commit 85cf0633 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch 'doc/update/cmake' into 'master'

Add installing cmake to 7.2 update docs

See merge request !1029
parents 5a6230b0 274ca090
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -86,6 +86,9 @@ sudo -u git -H git checkout 7-2-stable-ee
```bash
# Add support for lograte for better log file handling
sudo apt-get install logrotate
# Install cmake, which is needed for the latest versions of rugged
sudo apt-get install cmake
```
 
## 5. Update gitlab-shell
Loading
Loading
Loading
Loading
@@ -49,7 +49,16 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.9.7
```
 
### 4. Install libs, migrations, etc.
### 4. Install new system dependencies
The latest version of the 'rugged' gem requires cmake to build its native
extensions.
```bash
sudo apt-get install cmake
```
### 5. Install libs, migrations, etc.
 
```bash
cd /home/git/gitlab
Loading
Loading
@@ -71,7 +80,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
```
 
### 5. Update config files
### 6. Update config files
 
#### New configuration options for gitlab.yml
 
Loading
Loading
@@ -81,12 +90,12 @@ There are new configuration options available for gitlab.yml. View them with the
git diff 7-1-stable:config/gitlab.yml.example 7-2-stable:config/gitlab.yml.example
```
 
### 6. Start application
### 7. Start application
 
sudo service gitlab start
sudo service nginx restart
 
### 7. Check application status
### 8. Check application status
 
Check if GitLab and its environment are configured correctly:
 
Loading
Loading
@@ -98,7 +107,7 @@ To make sure you didn't miss anything run a more thorough check with:
 
If all items are green, then congratulations upgrade is complete!
 
### 8. Update OmniAuth configuration
### 9. Update OmniAuth configuration
 
When using Google omniauth login, changes of the Google account required.
Ensure that `Contacts API` and the `Google+ API` are enabled in the [Google Developers Console](https://console.developers.google.com/).
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment