diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-26 19:42:09 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-26 19:42:09 +0000 |
| commit | d672e6f8414ffa79222337b7f0fcd3eb42002b13 (patch) | |
| tree | 16cdae7a9986b347d120b09b4f3dfb6c1e48d2d4 | |
| parent | 6d50b3ebf2eb17950c4e31a4873a6238287a370c (diff) | |
| parent | 33af1478439b06810ed09260d7393e891ac5c07e (diff) | |
| download | gitlab-ce-d672e6f8414ffa79222337b7f0fcd3eb42002b13.tar.gz | |
Merge branch 'fix/bump-workhorse-version' into 'master'
Bump Workhorse version to 0.6.2
Fix for #12634 has been introduced in gitlab-org/gitlab-workhorse!34.
See merge request !2616
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 858c5dd96a2..e20330cd60a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,9 @@ v 8.5.0 (unreleased) - Track project import failure - Fix visibility level text in admin area (Zeger-Jan van de Weg) +v 8.4.2 (unreleased) + - Fix missing artifacts in build artifacts browser (fixed in Workhorse) + v 8.4.1 - Apply security updates for Rails (4.2.5.1), rails-html-sanitizer (1.0.3), and Nokogiri (1.6.7.2) diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index ee6cdce3c29..b6160487433 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -0.6.1 +0.6.2 |