diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-03-31 16:48:13 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-03-31 16:48:13 +0000 |
| commit | 3fb5c163a75873107bbd2edc6e7f10d355ec20aa (patch) | |
| tree | c68641ade8773735a90bfe269fff29420cfa42d3 | |
| parent | fc7454d89793681ce6bc2f07686edfb302fe005c (diff) | |
| parent | 2778c8f3054ec798ee4cfdf6f5a037b353998388 (diff) | |
| download | gitlab-ce-3fb5c163a75873107bbd2edc6e7f10d355ec20aa.tar.gz | |
Merge branch 'doc-upgrade-8.2-to-8.3' into 'master'
Updating documentation to include a missing step in the update procedure
See merge request !10373
| -rw-r--r-- | doc/update/8.2-to-8.3.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/update/8.2-to-8.3.md b/doc/update/8.2-to-8.3.md index f28896c2227..4b3c5bf6d64 100644 --- a/doc/update/8.2-to-8.3.md +++ b/doc/update/8.2-to-8.3.md @@ -120,6 +120,14 @@ There are new configuration options available for [`gitlab.yml`][yaml]. View the git diff origin/8-2-stable:config/gitlab.yml.example origin/8-3-stable:config/gitlab.yml.example ``` +#### GitLab default file + +The value of the `gitlab_workhorse_options` variable should be updated within the default gitlab file (`/etc/default/gitlab`) according to the following diff: + +```sh +git diff origin/8-2-stable:lib/support/init.d/gitlab.default.example origin/8-3-stable:lib/support/init.d/gitlab.default.example +``` + #### Nginx configuration GitLab 8.3 introduces major changes in the NGINX configuration. |