Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2015-02-15 03:28:50 +0300
committerJakub Jirutka <jakub@jirutka.cz>2015-05-06 14:15:33 +0300
commitb4be7aed7711e51becb3be29ed82d6753cc73cc4 (patch)
treebaa0f7c67124cdbcb072a6d3834bb9c66f9b0936 /spec/mailers
parent7af59c54fc1fcf9d19927e76be49318689684f8b (diff)
Allow to configure smtp and sendmail in gitlab.yml
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/notify_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index dbcf7286e45..f626efe1f76 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -5,9 +5,9 @@ describe Notify do
include EmailSpec::Matchers
include RepoHelpers
- let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name }
- let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
- let(:gitlab_sender_reply_to) { Gitlab.config.gitlab.email_reply_to }
+ let(:gitlab_sender_display_name) { Gitlab.config.outgoing_emails.display_name }
+ let(:gitlab_sender) { Gitlab.config.outgoing_emails.from }
+ let(:gitlab_sender_reply_to) { Gitlab.config.outgoing_emails.reply_to }
let(:recipient) { create(:user, email: 'recipient@example.com') }
let(:project) { create(:project) }