summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-05-24 08:49:54 +0000
committerDouwe Maan <douwe@gitlab.com>2018-05-24 08:49:54 +0000
commite97a87433b2f55b2f688771cbe47d627f49d4b44 (patch)
tree68b698985cca79d2d9b1351ec186b356e5e3bec2 /changelogs
parent56d2d462271da802a0126fa588f7ae76ae18f09f (diff)
parent13aa6f6740118743e47f24f01aa54fed30079f4d (diff)
downloadgitlab-ce-e97a87433b2f55b2f688771cbe47d627f49d4b44.tar.gz
Merge branch 'mr-conflict-notification' into 'master'
MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/mr-conflict-notification.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/mr-conflict-notification.yml b/changelogs/unreleased/mr-conflict-notification.yml
new file mode 100644
index 00000000000..d3d5f1fc373
--- /dev/null
+++ b/changelogs/unreleased/mr-conflict-notification.yml
@@ -0,0 +1,5 @@
+---
+title: When MR becomes unmergeable, notify and create todo for author and merge user
+merge_request: 18042
+author:
+type: added