summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-07-20 19:01:35 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-07-20 19:01:35 +0100
commit8ad47a7da99668c6d137ca37995177f3370777b3 (patch)
tree8ad82ece5b4e9f8c825b9c0a7d8c4eca721f638e
parent990dc577d1c24b4850f3a23b58dc7125e32c80de (diff)
downloadgitlab-ce-8ad47a7da99668c6d137ca37995177f3370777b3.tar.gz
Update CHANGELOG.md for 9.1.9
[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 7a2848c9b4a..7f530dea3b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 9.1.9 (2017-07-20)
+
+- Fix an infinite loop when handling user-supplied regular expressions.
+
## 9.1.8 (2017-07-19)
- Improve support for external issue references. !12485
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: