diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-13 16:39:58 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-13 16:39:58 +0300 |
| commit | dbb1cb30a3c4929f1d401ff43fc08a8f0927dc97 (patch) | |
| tree | f0bb68fa98e33f999d5118d1711ddf700634e1ce | |
| parent | 9f3a597092959c18ccbfae3db567cd17127542a2 (diff) | |
| parent | ecd33c9d92b6b4f4e69f70b168d816f6105428ac (diff) | |
| download | gitlab-ce-dbb1cb30a3c4929f1d401ff43fc08a8f0927dc97.tar.gz | |
Merge pull request #7441 from bbodenmiller/patch-7
add git config --global core.autocrlf check
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 3f219261abe..032ed5ee370 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -318,7 +318,8 @@ namespace :gitlab do options = { "user.name" => "GitLab", - "user.email" => Gitlab.config.gitlab.email_from + "user.email" => Gitlab.config.gitlab.email_from, + "core.autocrlf" => "input" } correct_options = options.map do |name, value| run(%W(git config --global --get #{name})).try(:squish) == value @@ -330,7 +331,8 @@ namespace :gitlab do puts "no".red try_fixing_it( sudo_gitlab("git config --global user.name \"#{options["user.name"]}\""), - sudo_gitlab("git config --global user.email \"#{options["user.email"]}\"") + sudo_gitlab("git config --global user.email \"#{options["user.email"]}\""), + sudo_gitlab("git config --global core.autocrlf \"#{options["core.autocrlf"]}\"") ) for_more_information( see_installation_guide_section "GitLab" |