diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 15:59:21 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 15:59:21 +0300 |
| commit | 86ec49add45d95f67fda749758d07a26ee030989 (patch) | |
| tree | 1c2009ae71ffddb78538cdd8e608fc795d6f596d /lib/tasks | |
| parent | 3f2282300d9c97e8c0c1df955bdd13d7ee1dc96e (diff) | |
| parent | b4be7aed7711e51becb3be29ed82d6753cc73cc4 (diff) | |
| download | gitlab-ce-86ec49add45d95f67fda749758d07a26ee030989.tar.gz | |
Merge pull request #8800 from jirutka/email-settings
Allow to configure smtp and sendmail in gitlab.yml
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 2 |
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| |