summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-11-08 10:47:45 +0000
committerDouwe Maan <douwe@gitlab.com>2016-11-08 10:47:45 +0000
commit9c3f3e9e359740b10edafaa1b06b0ff3e2070820 (patch)
tree01846d1a63bd1177b68377822fcb23b86e176cf2 /changelogs
parent8f85bd5789d50c080a7214981cc0a45fcb382bef (diff)
parent011e561bfa227f3ecbafe5b1ffd51700c680a15f (diff)
downloadgitlab-ce-9c3f3e9e359740b10edafaa1b06b0ff3e2070820.tar.gz
Merge branch 'use-separate-token-for-incoming-email' into 'master'
Use separate email-friendly token for incoming email See merge request !5914
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/use-separate-token-for-incoming-email.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/use-separate-token-for-incoming-email.yml b/changelogs/unreleased/use-separate-token-for-incoming-email.yml
new file mode 100644
index 00000000000..e498f8dd0a6
--- /dev/null
+++ b/changelogs/unreleased/use-separate-token-for-incoming-email.yml
@@ -0,0 +1,4 @@
+---
+title: Use separate email-token for incoming email and revert back the inactive feature
+merge_request: 5914
+author: