diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-11-20 12:41:26 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-20 10:25:38 -0500 |
| commit | b6ec1714a92970dcc29b68006ea3302ceb22f4f1 (patch) | |
| tree | 94861ff86242060be52c0c297fdc6d22409f43f5 | |
| parent | b6f0eddce552d7423869e9072a7a0706e309dbdf (diff) | |
| download | gitlab-ce-b6ec1714a92970dcc29b68006ea3302ceb22f4f1.tar.gz | |
Merge branch 'workhorse-version' into 'master'
Bump GitLab Workhorse version to 0.4.2
See merge request !1830
| -rw-r--r-- | GITLAB_WORKHORSE | 1 | ||||
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 | ||||
| -rw-r--r-- | doc/install/installation.md | 4 | ||||
| -rw-r--r-- | doc/update/8.1-to-8.2.md | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/GITLAB_WORKHORSE b/GITLAB_WORKHORSE deleted file mode 100644 index 267577d47e4..00000000000 --- a/GITLAB_WORKHORSE +++ /dev/null @@ -1 +0,0 @@ -0.4.1 diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index 9e11b32fcaa..2b7c5ae0184 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -0.3.1 +0.4.2 diff --git a/doc/install/installation.md b/doc/install/installation.md index 52ae30af805..a88ba8eeb5e 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -327,12 +327,12 @@ GitLab Shell is an SSH access and repository management software developed speci cd /home/git sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git cd gitlab-workhorse - sudo -u git -H git checkout 0.4.1 + sudo -u git -H git checkout 0.4.2 sudo -u git -H make ### Initialize Database and Activate Advanced Features - # Go to Gitlab installation folder + # Go to GitLab installation folder cd /home/git/gitlab diff --git a/doc/update/8.1-to-8.2.md b/doc/update/8.1-to-8.2.md index 261031442ac..b57e999cfb7 100644 --- a/doc/update/8.1-to-8.2.md +++ b/doc/update/8.1-to-8.2.md @@ -81,7 +81,7 @@ from GitLab 8.1. cd /home/git sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git cd gitlab-workhorse -sudo -u git -H git checkout 0.4.1 +sudo -u git -H git checkout 0.4.2 sudo -u git -H make ``` |