diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-26 19:42:09 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-26 11:42:51 -0800 |
| commit | c522d2ff655d6494cb45fcf9983d87abadbd655a (patch) | |
| tree | f63d70df3d5d51578a9dd54068b946c4fd1ef0e1 | |
| parent | 052b38dca119d43f7f4594b8d6d3a44bda13d2ce (diff) | |
| download | gitlab-ce-c522d2ff655d6494cb45fcf9983d87abadbd655a.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 | 14 | ||||
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 43eacb30491..e20330cd60a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,19 @@ Please view this file on the master branch, on stable branches it's out of date. +v 8.5.0 (unreleased) + - Add "visibility" flag to GET /projects api endpoint + - Ignore binary files in code search to prevent Error 500 (Stan Hu) + - Upgrade gitlab_git to 7.2.23 to fix commit message mentions in first branch push + - New UI for pagination + - Fix diff comments loaded by AJAX to load comment with diff in discussion tab + - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel) + - Don't vendor minified JS + - 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 |