diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-05-02 20:48:30 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-05-02 20:48:30 +0300 |
| commit | 703856c75ee7eefbfb536db306eaeec4c4b35e02 (patch) | |
| tree | 1da39f24a91d9e3015efe5cef52b9c7671712a92 /CHANGELOG | |
| parent | cfbff017d0ba1ba4fd896b4762b23853f123c60a (diff) | |
| parent | 4dda17a5bfe93e06f416fd4e33d487daee41731e (diff) | |
Merge branch 'make-reply-to-work-everywhere' into 'master'
Make Reply-To config apply to change e-mail confirmation and other notifications sent through Devise
Notifications sent through Devise were using the default From: address, and due to a broken test line nothing was actually being run.
The only way to customize the Devise Reply-To field is to use a custom mailer. Moved the e-mail configuration out of the initializers to accommodate this.
Closes #1556
See merge request !596
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2c5c9c76ccf..be0c005fa06 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.11.0 (unreleased) + - Make Reply-To config apply to change e-mail confirmation and other Devise notifications (Stan Hu) - Don't allow a merge request to be merged when its title starts with "WIP". - Add a page title to every page. - Get Gitorious importer to work again. |