diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-20 18:54:01 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-20 18:54:01 +0100 |
| commit | 18e164d54a7a3ed49300d75f1693566cdf8ecc46 (patch) | |
| tree | c1fc49febb08274b081620483feec68d2edea6dd | |
| parent | 2ccee2bc0f95b0f8454c811adde1f06ec00374b8 (diff) | |
| download | gitlab-ce-18e164d54a7a3ed49300d75f1693566cdf8ecc46.tar.gz | |
Update CHANGELOG.md for 9.2.9
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-re2-infinite-loop-nick.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cce371b319..b91e67efd14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 9.2.9 (2017-07-20) + +- Fix an infinite loop when handling user-supplied regular expressions. + ## 9.2.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: |