diff options
author | Marin Jankovski <marin@gitlab.com> | 2014-08-21 14:31:49 +0000 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2014-08-21 14:31:49 +0000 |
commit | 85cf0633fbd3090c83fc51ef57d58f07bdaebb94 (patch) | |
tree | 6dc72a6301e83d581385323d70c0b75314b93de7 /doc | |
parent | 5a6230b08cfe5ab281a07115c02de20db9e5caa8 (diff) | |
parent | 274ca09024c48d698b84e34ed8fbe01680190605 (diff) | |
download | gitlab-ce-85cf0633fbd3090c83fc51ef57d58f07bdaebb94.tar.gz |
Merge branch 'doc/update/cmake' into 'master'
Add installing cmake to 7.2 update docs
See merge request !1029
Diffstat (limited to 'doc')
-rw-r--r-- | doc/update/6.0-to-7.2.md | 3 | ||||
-rw-r--r-- | doc/update/7.1-to-7.2.md | 19 |
2 files changed, 17 insertions, 5 deletions
diff --git a/doc/update/6.0-to-7.2.md b/doc/update/6.0-to-7.2.md index 62f2a0aa9b4..aab3121dbc1 100644 --- a/doc/update/6.0-to-7.2.md +++ b/doc/update/6.0-to-7.2.md @@ -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 diff --git a/doc/update/7.1-to-7.2.md b/doc/update/7.1-to-7.2.md index 6359bcfac37..7407f2df0a3 100644 --- a/doc/update/7.1-to-7.2.md +++ b/doc/update/7.1-to-7.2.md @@ -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 @@ -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 @@ -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: @@ -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/). |