summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-04-19 15:42:06 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-04-19 15:42:06 +0000
commitaf06431cef89f3c41dd0f682ec2ab7a864c9a0b9 (patch)
tree4349ebc41d28c32fdcbf814999b0c2d420e23a51
parenteb467aeb7bad828d5cccb1ed7ee7e2826afe827e (diff)
parentc634d37086dde8ad2855e20051ba5bd551848122 (diff)
downloadgitlab-ce-af06431cef89f3c41dd0f682ec2ab7a864c9a0b9.tar.gz
Merge branch 'bump-version' into 'master'
Bump version to 8.8.0-pre See merge request !3809
-rw-r--r--CHANGELOG2
-rw-r--r--VERSION2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c6fe19d5689..de8095485ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
+v 8.8.0 (unreleased)
+
v 8.7.0 (unreleased)
- Transactions for /internal/allowed now have an "action" tag set
- Method instrumentation now uses Module#prepend instead of aliasing methods
diff --git a/VERSION b/VERSION
index 91ab1f99daf..d5a967c3933 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.7.0-pre
+8.8.0-pre