diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-09-11 11:46:08 +0200 |
|---|---|---|
| committer | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-09-11 11:46:08 +0200 |
| commit | bf0de1a500e7a9aecc7c8bbf623ad39b75c6433b (patch) | |
| tree | 382df65e2b17c91e03278d58bce8dce0129a6a7b /doc/update/7.1-to-7.2.md | |
| parent | b18d1c2786c2a385d6b797734a1afad7a01ddf35 (diff) | |
| parent | 78ec7d9c9d156fe556d165c1c096bf5534d62d25 (diff) | |
| download | gitlab-ce-bf0de1a500e7a9aecc7c8bbf623ad39b75c6433b.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring
Diffstat (limited to 'doc/update/7.1-to-7.2.md')
| -rw-r--r-- | doc/update/7.1-to-7.2.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/update/7.1-to-7.2.md b/doc/update/7.1-to-7.2.md index b06f62aeb03..ff5574114a8 100644 --- a/doc/update/7.1-to-7.2.md +++ b/doc/update/7.1-to-7.2.md @@ -89,6 +89,9 @@ There are new configuration options available for gitlab.yml. View them with the git diff 7-1-stable:config/gitlab.yml.example 7-2-stable:config/gitlab.yml.example ``` +* HTTP setups: Make `/etc/nginx/sites-available/nginx` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-0-stable/lib/support/nginx/gitlab but with your settings. +* HTTPS setups: Make `/etc/nginx/sites-available/nginx-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-0-stable/lib/support/nginx/gitlab-ssl but with your setting + Update rack attack middleware config ``` |