diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-08 12:26:58 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-08 12:26:58 +0300 |
| commit | 5b8712e4c28bb445205df93a48fe2aefbc94a3c6 (patch) | |
| tree | e7950d5e51c08b607848bf45dc5f707d7bb78846 /lib | |
| parent | 0384d2929f25e433d394db70cfc29896fadaa4a5 (diff) | |
| parent | dc76d102b4cec39767414d7f3e7d85728e720d42 (diff) | |
| download | gitlab-ce-5b8712e4c28bb445205df93a48fe2aefbc94a3c6.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
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| |