From 5f7d6c7d746e4f71d3f48eedf473a74d1131907a Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Wed, 3 Jun 2015 11:26:57 +0200
Subject: Remove gitlab:env:check task.

---
 doc/install/installation.md  |  6 -----
 doc/raketasks/maintenance.md |  3 +--
 lib/tasks/gitlab/check.rake  | 55 +-------------------------------------------
 3 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 1db2b438292..be0dd37a48b 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -241,12 +241,6 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
     # Copy the example Rack attack config
     sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
 
-    # Configure Git global settings for git user, useful when editing via web
-    # Edit user.email according to what is set in gitlab.yml
-    sudo -u git -H git config --global user.name "GitLab"
-    sudo -u git -H git config --global user.email "example@example.com"
-    sudo -u git -H git config --global core.autocrlf input
-
     # Configure Redis connection settings
     sudo -u git -H cp config/resque.yml.example config/resque.yml
 
diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md
index 41a994f3f68..2aca91d5371 100644
--- a/doc/raketasks/maintenance.md
+++ b/doc/raketasks/maintenance.md
@@ -47,7 +47,6 @@ Git:              /usr/bin/git
 
 Runs the following rake tasks:
 
-- `gitlab:env:check`
 - `gitlab:gitlab_shell:check`
 - `gitlab:sidekiq:check`
 - `gitlab:app:check`
@@ -147,7 +146,7 @@ Do you want to continue (yes/no)? yes
 
 ## Clear redis cache
 
-If for some reason the dashboard shows wrong information you might want to 
+If for some reason the dashboard shows wrong information you might want to
 clear Redis' cache.
 
 For Omnibus-packages:
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 1a6303b6c82..3f4f6737913 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -1,7 +1,6 @@
 namespace :gitlab do
   desc "GITLAB | Check the configuration of GitLab and its environment"
-  task check: %w{gitlab:env:check
-                 gitlab:gitlab_shell:check
+  task check: %w{gitlab:gitlab_shell:check
                  gitlab:sidekiq:check
                  gitlab:ldap:check
                  gitlab:app:check}
@@ -298,58 +297,6 @@ namespace :gitlab do
     end
   end
 
-
-
-  namespace :env do
-    desc "GITLAB | Check the configuration of the environment"
-    task check: :environment  do
-      warn_user_is_not_gitlab
-      start_checking "Environment"
-
-      check_gitlab_git_config
-
-      finished_checking "Environment"
-    end
-
-
-    # Checks
-    ########################
-
-    def check_gitlab_git_config
-      print "Git configured for #{gitlab_user} user? ... "
-
-      options = {
-        "user.name"  => "GitLab",
-        "user.email" => Gitlab.config.gitlab.email_from,
-        "core.autocrlf" => "input"
-      }
-      correct_options = options.map do |name, value|
-        run(%W(#{Gitlab.config.git.bin_path} config --global --get #{name})).try(:squish) == value
-      end
-
-      if correct_options.all?
-        puts "yes".green
-      else
-        print "Trying to fix Git error automatically. ..."
-        if auto_fix_git_config(options)
-          puts "Success".green
-        else
-          puts "Failed".red
-          try_fixing_it(
-            sudo_gitlab("\"#{Gitlab.config.git.bin_path}\" config --global user.name  \"#{options["user.name"]}\""),
-            sudo_gitlab("\"#{Gitlab.config.git.bin_path}\" config --global user.email \"#{options["user.email"]}\""),
-            sudo_gitlab("\"#{Gitlab.config.git.bin_path}\" config --global core.autocrlf \"#{options["core.autocrlf"]}\"")
-          )
-          for_more_information(
-            see_installation_guide_section "GitLab"
-          )
-        end
-      end
-    end
-  end
-
-
-
   namespace :gitlab_shell do
     desc "GITLAB | Check the configuration of GitLab Shell"
     task check: :environment  do
-- 
cgit v1.2.3