summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce <bryce@gitlab.com>2016-08-23 11:31:39 +0200
committerBryce <bryce@gitlab.com>2016-08-23 11:31:39 +0200
commitbec787419152df3cea50723a60d199396991dfb2 (patch)
tree99b9df2cd75abd85b580ad30d431d5963a5d6f6a
parent2c909a5a3c219cad6e6ef8c78a4984ab311d14cb (diff)
parentf633f7db66d4ff42abbe764c21f9da4e49045f91 (diff)
downloadgitlab-ce-pipelines-layout-regression.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipelines-layout-regressionpipelines-layout-regression
-rw-r--r--CHANGELOG1
-rw-r--r--VERSION2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5740ba89791..41b6ab97a42 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 8.12.0 (unreleased)
v 8.11.0 (unreleased)
- Fix pipelines tab layout regression (brycepj)
+v 8.11.0
- Use test coverage value from the latest successful pipeline in badge. !5862
- Add test coverage report badge. !5708
- Remove the http_parser.rb dependency by removing the tinder gem. !5758 (tbalthazar)
diff --git a/VERSION b/VERSION
index 542e7824102..8a5bbc87ef9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.11.0-pre
+8.12.0-pre