diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-08-10 20:18:55 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-08-10 20:18:55 +0100 |
| commit | 513c762a2097b541197438e9cf960e5b399e83a8 (patch) | |
| tree | c187be776db7f12c09eaa89fb1064b2578690f30 | |
| parent | 2377923e89968997a13db6e009b8a48c5bf6f00a (diff) | |
| parent | 581dcfa6906f9f78adfbc458f2b5ae43c1213fe9 (diff) | |
| download | gitlab-ce-9-0-stable.tar.gz | |
Merge branch '9-0-stable' of https://gitlab.com/gitlab-org/gitlab-ce into 9-0-stable9-0-stable
| -rw-r--r-- | doc/install/installation.md | 3 | ||||
| -rw-r--r-- | doc/update/8.17-to-9.0.md | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 4a6e748603d..df027014f7d 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -66,6 +66,9 @@ Install the required packages (needed to compile Ruby and native extensions to R sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libre2-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils pkg-config cmake +Ubuntu 14.04 (Trusty Tahr) doesn't have the `libre2-dev` package available, but +you can [install re2 manually](https://github.com/google/re2/wiki/Install). + If you want to use Kerberos for user authentication, then install libkrb5-dev: sudo apt-get install libkrb5-dev diff --git a/doc/update/8.17-to-9.0.md b/doc/update/8.17-to-9.0.md index 6308317b1f2..a8dda8ee092 100644 --- a/doc/update/8.17-to-9.0.md +++ b/doc/update/8.17-to-9.0.md @@ -261,6 +261,16 @@ sudo systemctl daemon-reload ### 9. Install libs, migrations, etc. +GitLab 9.0.11 [introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/24570) +a dependency on on the `re2` regular expression library. To install this dependency: + +```bash +sudo apt-get install libre2-dev +``` + +Ubuntu 14.04 (Trusty Tahr) doesn't have the `libre2-dev` package available, but +you can [install re2 manually](https://github.com/google/re2/wiki/Install). + ```bash cd /home/git/gitlab |