diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-15 15:17:37 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-15 15:17:37 +0000 |
| commit | ee54e56f7df6b227df6f271f6ea8cdc8c660935c (patch) | |
| tree | 9cca4f4cd9698cbe67b46ec8fdc59119a742e8bd | |
| parent | 14ab0228a889980df2e4ce58815b1fff6d916dc1 (diff) | |
| parent | 83de96ae3a5acbbaf8b94a04b6c160e6819d91a2 (diff) | |
| download | gitlab-ce-ee54e56f7df6b227df6f271f6ea8cdc8c660935c.tar.gz | |
Merge branch 'kerberos_dependency' into 'master'
Kerberos dependency
See merge request !1324
| -rw-r--r-- | doc/install/installation.md | 2 | ||||
| -rw-r--r-- | doc/update/7.5-to-7.6.md | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 263259bc2f9..f55a0e73199 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -54,7 +54,7 @@ up-to-date and install it. 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 pkg-config 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 libkrb5-dev Make sure you have the right version of Git installed diff --git a/doc/update/7.5-to-7.6.md b/doc/update/7.5-to-7.6.md index deee73fe560..a5d76c341af 100644 --- a/doc/update/7.5-to-7.6.md +++ b/doc/update/7.5-to-7.6.md @@ -45,6 +45,8 @@ sudo -u git -H git checkout v2.2.0 ### 4. Install libs, migrations, etc. ```bash +sudo apt-get install libkrb5-dev + cd /home/git/gitlab # MySQL installations (note: the line below states '--without ... postgres') |