Merge branch 'version-1.1.1' into 'master'

Version 1.1.1 See merge request !96

Merge branch 'version-1.1.1' into 'master'
Version 1.1.1 See merge request !96
f2d0435b · Jacob Vosmaer (GitLab) · ed9d1e66 · 45016a71 · f2d0435b · f2d0435b
Commit f2d0435b authored Dec 08, 2016 by Jacob Vosmaer (GitLab)
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

CHANGELOG CHANGELOG +4 -0

VERSION VERSION +1 -1

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

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

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

 - Prometheus metrics listener via `-prometheusListenAddr` option

--- a/VERSION
+++ b/VERSION
-1.1.0
+1.1.1