summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-29 12:05:23 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-29 12:05:23 +0000
commitd8eee8ed73de13a5af42a5cf6de8ec1194e45483 (patch)
tree4861b64cb35b8bdaa53f3b07427c455e748e1441 /changelogs
parent35212deb062dda60220a9a0929c26196c1c598b5 (diff)
parentb62e2bedbfa49aacfc4847049aa589f045af15ce (diff)
downloadgitlab-ce-d8eee8ed73de13a5af42a5cf6de8ec1194e45483.tar.gz
Merge branch '24880-configurable-plaintext-emails' into 'master'
Add setting to enable/disable HTML emails Closes #24880 See merge request !7749
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/7749-add-setting-to-disable-html-emails.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/changelogs/unreleased/7749-add-setting-to-disable-html-emails.yml b/changelogs/unreleased/7749-add-setting-to-disable-html-emails.yml
new file mode 100644
index 00000000000..9dd04d3f089
--- /dev/null
+++ b/changelogs/unreleased/7749-add-setting-to-disable-html-emails.yml
@@ -0,0 +1,3 @@
+title: Add setting to enable/disable HTML emails
+merge_request: 7749
+author: