kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Add installing cmake to 7.2 update docs

See merge request !1029
This commit is contained in:
Marin Jankovski 2014-08-21 14:31:49 +00:00
commit 85cf0633fb
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/update/6.0-to-7.2.md
View file

@ -86,6 +86,9 @@ sudo -u git -H git checkout 7-2-stable-ee
```bash ```bash
# Add support for lograte for better log file handling # Add support for lograte for better log file handling
sudo apt-get install logrotate 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 ## 5. Update gitlab-shell

19
doc/update/7.1-to-7.2.md
View file

@ -49,7 +49,16 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.9.7 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 ```bash
cd /home/git/gitlab 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 sudo chmod +x /etc/init.d/gitlab
``` ```
### 5. Update config files ### 6. Update config files
#### New configuration options for gitlab.yml #### 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 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 gitlab start
sudo service nginx restart sudo service nginx restart
### 7. Check application status ### 8. Check application status
Check if GitLab and its environment are configured correctly: 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! 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. 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/). Ensure that `Contacts API` and the `Google+ API` are enabled in the [Google Developers Console](https://console.developers.google.com/).