diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-12 16:59:10 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-12 16:59:10 +0000 |
| commit | 025f061765a525c1c3996c97434c1c72cf2497cb (patch) | |
| tree | 555be957fe94e20eb646d7d81bd55bbb856f733e | |
| parent | 9cbdc2d8606354135f80ff097c91533fbeadf7b4 (diff) | |
| parent | fac252c9a2230b58b0de7b16fb7318fc048f32a0 (diff) | |
| download | gitlab-ce-025f061765a525c1c3996c97434c1c72cf2497cb.tar.gz | |
Merge branch 'gitlab-omnibus-really' into 'master'
Never heard of gitlab-omnibus
See merge request !2388
| -rw-r--r-- | doc/integration/shibboleth.md | 4 | ||||
| -rw-r--r-- | doc/release/patch.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md index 6258e5f1030..a0be3dd4e5c 100644 --- a/doc/integration/shibboleth.md +++ b/doc/integration/shibboleth.md @@ -1,8 +1,8 @@ # Shibboleth OmniAuth Provider -This documentation is for enabling shibboleth with gitlab-omnibus package. +This documentation is for enabling shibboleth with omnibus-gitlab package. -In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however I did not found way to easily configure Nginx that is bundled in gitlab-omnibus package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider. +In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however I did not found way to easily configure Nginx that is bundled in omnibus-gitlab package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider. To enable the Shibboleth OmniAuth provider you must: diff --git a/doc/release/patch.md b/doc/release/patch.md index 3022e375aca..1c921439156 100644 --- a/doc/release/patch.md +++ b/doc/release/patch.md @@ -24,7 +24,7 @@ Use the following template: - Picked into respective `stable` branches: - [ ] Merge `x-y-stable` into `x-y-stable-ee` - [ ] release-tools: `x.y.z` -- gitlab-omnibus +- omnibus-gitlab - [ ] `x.y.z+ee.0` - [ ] `x.y.z+ce.0` - [ ] Deploy |