diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 3f219261abea1d5ce8bca8b2906f3c712896c4ed..032ed5ee370add0bfb98a8dd94072de4ee22c742 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"