summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-11-09 21:23:56 +0000
committerMichael Kozono <mkozono@gmail.com>2017-11-09 16:03:42 -0800
commitb2a5c7c40f27ec74694af6361ca68269a38ad709 (patch)
tree9e291a62c500591bcaef95728345f11c1089ff4a /changelogs
parent078f29f6d0c584db58669bada17bf5c4e1929de0 (diff)
downloadgitlab-ce-b2a5c7c40f27ec74694af6361ca68269a38ad709.tar.gz
Merge branch 'mk-add-security-fixes-to-changelog-master' into 'master'
Add 10.1.2 security fixes to CHANGELOG on master See merge request gitlab-org/gitlab-ce!15305
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fix-mysql-grant-check.yml5
1 files changed, 0 insertions, 5 deletions
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