summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2015-02-15 01:28:50 +0100
committerJakub Jirutka <jakub@jirutka.cz>2015-05-06 13:15:33 +0200
commitb4be7aed7711e51becb3be29ed82d6753cc73cc4 (patch)
treebaa0f7c67124cdbcb072a6d3834bb9c66f9b0936 /lib/tasks
parent7af59c54fc1fcf9d19927e76be49318689684f8b (diff)
downloadgitlab-ce-b4be7aed7711e51becb3be29ed82d6753cc73cc4.tar.gz
Allow to configure smtp and sendmail in gitlab.yml
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/gitlab/check.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 1a6303b6c82..f967fddf56d 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -320,7 +320,7 @@ namespace :gitlab do
options = {
"user.name" => "GitLab",
- "user.email" => Gitlab.config.gitlab.email_from,
+ "user.email" => Gitlab.config.outgoing_emails.from,
"core.autocrlf" => "input"
}
correct_options = options.map do |name, value|