diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-08 12:16:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-08 12:16:40 +0300 |
| commit | dc76d102b4cec39767414d7f3e7d85728e720d42 (patch) | |
| tree | f1e568fb6d72fbad682548998f1624906d613618 /lib | |
| parent | 0fc6f0b5d406f530e9ad8a35f0188536f6525cb9 (diff) | |
| parent | 317ed1fa9034eba91af95b2e98a3576497cbaf3a (diff) | |
| download | gitlab-ce-dc76d102b4cec39767414d7f3e7d85728e720d42.tar.gz | |
Merge pull request #9254 from gitlabhq/revert-8800-email-settings
Revert "Allow to configure smtp and sendmail in gitlab.yml"
Diffstat (limited to 'lib')
| -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 f967fddf56d..1a6303b6c82 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.outgoing_emails.from, + "user.email" => Gitlab.config.gitlab.email_from, "core.autocrlf" => "input" } correct_options = options.map do |name, value| |