summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-05-02 17:48:30 +0000
committerRobert Speicher <robert@gitlab.com>2015-05-02 17:48:30 +0000
commit703856c75ee7eefbfb536db306eaeec4c4b35e02 (patch)
tree1da39f24a91d9e3015efe5cef52b9c7671712a92 /lib/api/files.rb
parentcfbff017d0ba1ba4fd896b4762b23853f123c60a (diff)
parent4dda17a5bfe93e06f416fd4e33d487daee41731e (diff)
downloadgitlab-ce-703856c75ee7eefbfb536db306eaeec4c4b35e02.tar.gz
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 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions