diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-08-10 20:20:44 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-08-10 20:20:44 +0100 |
| commit | 7f4bc71131e80393040ea25ba086cb33b2c08fe8 (patch) | |
| tree | 6f764bb64663477f99cbb76c79445b14556b0fa7 | |
| parent | d09fe1e789d014cebc46cb54fb5a0fc1d8d24dbb (diff) | |
| parent | 41c93c21088ce6b7edbd85cc6323b8dbc0b1120b (diff) | |
| download | gitlab-ce-9-1-stable.tar.gz | |
Merge branch '9-1-stable' of https://gitlab.com/gitlab-org/gitlab-ce into 9-1-stable9-1-stable
| -rw-r--r-- | doc/install/installation.md | 3 | ||||
| -rw-r--r-- | doc/update/8.17-to-9.0.md | 10 | ||||
| -rw-r--r-- | doc/update/9.0-to-9.1.md | 10 |
3 files changed, 23 insertions, 0 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index d96766e825d..e97125070bd 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 diff --git a/doc/update/9.0-to-9.1.md b/doc/update/9.0-to-9.1.md index 2d597894517..c2cfeb0a692 100644 --- a/doc/update/9.0-to-9.1.md +++ b/doc/update/9.0-to-9.1.md @@ -261,6 +261,16 @@ sudo systemctl daemon-reload ### 9. Install libs, migrations, etc. +GitLab 9.1.8 [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 |