summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-11-08 17:49:24 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-11-08 17:49:24 +0800
commit567d8a636ce93698f171e97d1b73219bd45deb4c (patch)
treef488453219c8098083d4cb8cc69dfb985bea123a
parent1bc43e657bf116bbeec2e0e2e8664cdf6261a4c4 (diff)
downloadgitlab-ce-567d8a636ce93698f171e97d1b73219bd45deb4c.tar.gz
Update CHANGELOG.md for 10.1.2
[ci skip]
-rw-r--r--CHANGELOG.md4
-rw-r--r--changelogs/unreleased/fix-mysql-grant-check.yml5
2 files changed, 4 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e9515c1da9..30ab05164c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.1.2 (2017-11-08)
+
+- [FIXED] Fix TRIGGER checks for MySQL.
+
## 10.1.1 (2017-10-31)
- [FIXED] Auto Devops kubernetes default namespace is now correctly built out of gitlab project group-name. !14642 (Mircea Danila Dumitrescu)
diff --git a/changelogs/unreleased/fix-mysql-grant-check.yml b/changelogs/unreleased/fix-mysql-grant-check.yml
deleted file mode 100644
index a1c1aa67d79..00000000000
--- a/changelogs/unreleased/fix-mysql-grant-check.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix TRIGGER checks for MySQL
-merge_request:
-author:
-type: fixed