Commit 2c7e0874 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 24ecb6d4 23d4fcbd
...@@ -49,7 +49,7 @@ up-to-date and install it. ...@@ -49,7 +49,7 @@ up-to-date and install it.
Install the required packages (needed to compile Ruby and native extensions to Ruby gems): Install the required packages (needed to compile Ruby and native extensions to Ruby gems):
sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils cmake sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils pkg-config cmake
Make sure you have the right version of Git installed Make sure you have the right version of Git installed
......
...@@ -85,8 +85,8 @@ sudo -u git -H git checkout 7-2-stable-ee ...@@ -85,8 +85,8 @@ sudo -u git -H git checkout 7-2-stable-ee
# 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 # Install pkg-config and cmake, which is needed for the latest versions of rugged
sudo apt-get install cmake sudo apt-get install pkg-config cmake
``` ```
## 5. Update gitlab-shell ## 5. Update gitlab-shell
......
...@@ -51,11 +51,11 @@ sudo -u git -H git checkout v1.9.7 ...@@ -51,11 +51,11 @@ sudo -u git -H git checkout v1.9.7
### 4. Install new system dependencies ### 4. Install new system dependencies
The latest version of the 'rugged' gem requires cmake to build its native The latest version of the 'rugged' gem requires `pkg-config` and `cmake` to
extensions. build its native extensions.
```bash ```bash
sudo apt-get install cmake sudo apt-get install pkg-config cmake
``` ```
### 5. Install libs, migrations, etc. ### 5. Install libs, migrations, etc.
......
...@@ -21,7 +21,7 @@ If you have local changes to your GitLab repository the script will stash them a ...@@ -21,7 +21,7 @@ If you have local changes to your GitLab repository the script will stash them a
## 2. Run GitLab upgrade tool ## 2. Run GitLab upgrade tool
Note: GitLab 7.2 adds cmake as dependency. Please check the dependencies in the [installation guide.](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#1-packages-dependencies) Note: GitLab 7.2 adds `pkg-config` and `cmake` as dependency. Please check the dependencies in the [installation guide.](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#1-packages-dependencies)
# Starting with GitLab version 7.0 upgrader script has been moved to bin directory # Starting with GitLab version 7.0 upgrader script has been moved to bin directory
cd /home/git/gitlab cd /home/git/gitlab
......
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