diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 17:49:05 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 17:49:05 +0300 |
| commit | ea6667b06ceb38b42dc673b57a1ca8682f7b709a (patch) | |
| tree | 227058c3f165aa3cdb94e2437619f5466d95346c /lib | |
| parent | dd37aa06ca5d82683e3517d490ac5eca3138ef47 (diff) | |
| parent | 86ec49add45d95f67fda749758d07a26ee030989 (diff) | |
| download | gitlab-ce-ea6667b06ceb38b42dc673b57a1ca8682f7b709a.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 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| |