diff options
author | Robert Speicher <robert@gitlab.com> | 2015-12-09 18:29:42 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-12-09 18:29:42 +0000 |
commit | cfe46f485da6e45ddb9f64d471b92892579dd9b7 (patch) | |
tree | d2350f731afacdc52bdefc9455850e3caf3d9120 /doc | |
parent | b255aad2d2ed7fa461056e2cd940c5d706285fe4 (diff) | |
parent | 64eaccf10a7ac70c3dc2f9565a638e9f45a8359c (diff) | |
download | gitlab-ce-cfe46f485da6e45ddb9f64d471b92892579dd9b7.tar.gz |
Merge branch 'master' into 'master'
Update init script only once
The init script is already being updated in section 6.
See merge request !2038
[ci skip]
Diffstat (limited to 'doc')
-rw-r--r-- | doc/update/8.1-to-8.2.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/update/8.1-to-8.2.md b/doc/update/8.1-to-8.2.md index 7b228d6a22f..b08a79ca0aa 100644 --- a/doc/update/8.1-to-8.2.md +++ b/doc/update/8.1-to-8.2.md @@ -85,11 +85,10 @@ sudo -u git -H git checkout 0.4.2 sudo -u git -H make ``` -Update the GitLab init script and 'default' file. +Update the GitLab 'default' file. ``` cd /home/git/gitlab -sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab test -e /etc/default/gitlab && \ sudo sed -i.pre-8.2 's/^\([^=]*\)gitlab_git_http_server/\1gitlab_workhorse/' /etc/default/gitlab ``` |