summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-07-20 19:07:48 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-07-20 19:07:48 +0100
commit27bd37fe0fec3bfe8f969a879c4ebcbe20af6a5e (patch)
tree8f81fd315b4fadd79add1d43f68bce275c2d2d8d
parente6c5c5368c6dd432196284e0b4e5c4a78b19c015 (diff)
downloadgitlab-ce-27bd37fe0fec3bfe8f969a879c4ebcbe20af6a5e.tar.gz
Update CHANGELOG.md for 9.0.12
[ci skip]
-rw-r--r--CHANGELOG.md4
-rw-r--r--changelogs/unreleased/fix-re2-infinite-loop-nick.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4c69cebfb4..3eebe987ebe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 9.0.12 (2017-07-20)
+
+- Fix an infinite loop when handling user-supplied regular expressions.
+
## 9.0.11 (2017-07-19)
- Renders 404 if given project is not readable by the user on Todos dashboard.
diff --git a/changelogs/unreleased/fix-re2-infinite-loop-nick.yml b/changelogs/unreleased/fix-re2-infinite-loop-nick.yml
deleted file mode 100644
index 3c314ab2718..00000000000
--- a/changelogs/unreleased/fix-re2-infinite-loop-nick.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix an infinite loop when handling user-supplied regular expressions
-merge_request:
-author: