diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-21 16:07:21 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-21 16:07:21 +0000 |
| commit | 0bf68c0cd59e0805da5578bfc3fc193aaccce6d6 (patch) | |
| tree | 12a3b33e98ada8ca6b5aca0eabaa77fce2294985 /doc | |
| parent | 597d3bbe41dc27e113c860e7f0fa2febae7a1caf (diff) | |
| parent | 1c1590a510de0e6836e204b6d47fa810e5ec4f6c (diff) | |
| download | gitlab-ce-0bf68c0cd59e0805da5578bfc3fc193aaccce6d6.tar.gz | |
Merge branch 'workhorse-path' into 'master'
Init script changes for gitlab-workhorse in 8.4
Goes with https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/31
Also bumps gitlab-workhorse to 0.6.1.
[ci skip]
See merge request !2529
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/update/8.3-to-8.4.md | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/doc/update/8.3-to-8.4.md b/doc/update/8.3-to-8.4.md index 604939cd733..bf80f66d004 100644 --- a/doc/update/8.3-to-8.4.md +++ b/doc/update/8.3-to-8.4.md @@ -48,7 +48,7 @@ which should already be on your system from GitLab 8.1. ```bash cd /home/git/gitlab-workhorse sudo -u git -H git fetch --all -sudo -u git -H git checkout 0.6.0 +sudo -u git -H git checkout 0.6.1 sudo -u git -H make ``` @@ -104,10 +104,7 @@ via [/etc/default/gitlab]. #### Init script -We updated the init script for GitLab in order to pass new -configuration options to gitlab-workhorse. We let gitlab-workhorse -connect to the Rails application via a Unix domain socket and we tell -it where the 'public' directory of GitLab is. +We updated the init script for GitLab in order to set a specific PATH for gitlab-workhorse. ``` cd /home/git/gitlab |