summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-03 15:14:04 +0000
committerDouwe Maan <douwe@gitlab.com>2015-04-03 15:14:04 +0000
commit04a42ce3f1688dd262f72f654b62d840c7efac6e (patch)
tree162e0fb0f302beab2920d542f2e158eb495a5191 /CHANGELOG
parentaaacef47fff4d7c359cb025caf879dff56a98932 (diff)
parent81a5a9713d69c738912d27cb10e74577aa4f4978 (diff)
downloadgitlab-ce-04a42ce3f1688dd262f72f654b62d840c7efac6e.tar.gz
Merge branch 'custom-email-reply-to' into 'master'
Add ability to configure Reply-To address ### What does this MR do? This MR adds configuration variable `email_reply_to` to make it possible to configure a custom Reply-To address other than the default `noreply@mydomain.com`. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1305 See merge request !455
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7fdd7e38a93..f4d726bf1ca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
- Fix bug where error messages from Dropzone would not be displayed on the issues page (Stan Hu)
+ - Add ability to configure Reply-To address in gitlab.yml (Stan Hu)
- Fix broken side-by-side diff view on merge request page (Stan Hu)
- Set Application controller default URL options to ensure all url_for calls are consistent (Stan Hu)
- Allow HTML tags in Markdown input