Merge branch 'version-1.2.0' into 'master'

Version 1.2.0 See merge request !98

Merge branch 'version-1.2.0' into 'master'
Version 1.2.0 See merge request !98
5aa350e3 · Jacob Vosmaer (GitLab) · cf40f383 · 1997f415 · 5aa350e3 · 5aa350e3
Commit 5aa350e3 authored Dec 15, 2016 by Jacob Vosmaer (GitLab)
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

CHANGELOG CHANGELOG +5 -0

VERSION VERSION +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@

 Formerly known as 'gitlab-git-http-server'.

+v1.2.0
+
+- Add terminal websocket proxy endpoint
+- Rewrite all incoming multipart requests: write 'file' parts to tempfiles
+
 v1.1.1

 - Restrict effect of API rate limiting to /ci/api/v1/builds/register.json

--- a/VERSION
+++ b/VERSION
-1.1.1
+1.2.0