diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 17:39:18 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 17:39:18 +0300 |
| commit | 317ed1fa9034eba91af95b2e98a3576497cbaf3a (patch) | |
| tree | 5aecfc4a32e2a784211cfc1fa3d37b49ca791f66 /spec/mailers | |
| parent | 86ec49add45d95f67fda749758d07a26ee030989 (diff) | |
| download | gitlab-ce-317ed1fa9034eba91af95b2e98a3576497cbaf3a.tar.gz | |
Revert "Allow to configure smtp and sendmail in gitlab.yml"
Diffstat (limited to 'spec/mailers')
| -rw-r--r-- | spec/mailers/notify_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index f626efe1f76..dbcf7286e45 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.outgoing_emails.display_name } - let(:gitlab_sender) { Gitlab.config.outgoing_emails.from } - let(:gitlab_sender_reply_to) { Gitlab.config.outgoing_emails.reply_to } + 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(:recipient) { create(:user, email: 'recipient@example.com') } let(:project) { create(:project) } |