diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-12-02 05:01:41 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-12-02 05:01:41 +0000 |
| commit | 14046b9c734e5e6506d63276f39f3f9d770c3699 (patch) | |
| tree | 74a8a7550960cc198c5bc954fd57acb9429965af /doc | |
| parent | ec4e7d9a9f7f3526a15905c3fb5d851e4c173349 (diff) | |
| parent | 2c0bcefdc6af442f67f74c6124fc1a9cbacd2831 (diff) | |
| download | gitlab-ce-14046b9c734e5e6506d63276f39f3f9d770c3699.tar.gz | |
Merge branch 'remove-gitlab-workhorse-version-option-from-install-task' into 'master'
Don't allow to specify a repo or version when installing Workhorse
I've also updated the "patch version upgrade" doc since I did forget to update it in !6574.
See merge request !7879
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/install/installation.md | 12 | ||||
| -rw-r--r-- | doc/update/patch_versions.md | 7 |
2 files changed, 3 insertions, 16 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 77adb4c9f7b..4b0c585e51e 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -404,18 +404,6 @@ which is the recommended location. sudo -u git -H bundle exec rake "gitlab:workhorse:install[/home/git/gitlab-workhorse]" RAILS_ENV=production -You can specify a different Git repository by providing `GITLAB_WORKHORSE_REPO`: - - cd /home/git/gitlab - - sudo -u git -H bundle exec rake "gitlab:workhorse:install[/home/git/gitlab-workhorse]" GITLAB_WORKHORSE_REPO=https://example.com/gitlab-workhorse.git RAILS_ENV=production - -You can specify a different version to use by providing `GITLAB_WORKHORSE_VERSION`: - - cd /home/git/gitlab - - sudo -u git -H bundle exec rake "gitlab:workhorse:install[/home/git/gitlab-workhorse]" GITLAB_WORKHORSE_VERSION=0.8.1 RAILS_ENV=production - ### Initialize Database and Activate Advanced Features # Go to GitLab installation folder diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index 60729316cde..e98c40ca4c0 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -45,10 +45,9 @@ sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_SHELL_VERSION` -b v`ca ### 4. Update gitlab-workhorse to the corresponding version ```bash -cd /home/git/gitlab-workhorse -sudo -u git -H git fetch -sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_WORKHORSE_VERSION` -b v`cat /home/git/gitlab/GITLAB_WORKHORSE_VERSION` -sudo -u git -H make +cd /home/git/gitlab + +sudo -u git -H bundle exec rake "gitlab:workhorse:install[/home/git/gitlab-workhorse]" RAILS_ENV=production ``` ### 5. Install libs, migrations, etc. |