Merge branch 'git_user_email_and_rake_check' into 'master'

Remove git user email git user name

See merge request !365

files/gitlab-config-template/gitlab.rb.template

@@ -227,8 +227,6 @@ external_url 'GENERATED_EXTERNAL_URL'
 # user['shell'] = "/bin/sh"
 # # The home directory for the git user
 # user['home'] = "/var/opt/gitlab"
-# user['git_user_name'] = "GitLab"
-# user['git_user_email'] = "gitlab@#{node['fqdn']}"
 
 ##################
 # GitLab Unicorn #

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -37,9 +37,6 @@ default['gitlab']['user']['gid'] = nil
 default['gitlab']['user']['shell'] = "/bin/sh"
 # The home directory for the chef services user
 default['gitlab']['user']['home'] = "/var/opt/gitlab"
-default['gitlab']['user']['git_user_name'] = "GitLab"
-default['gitlab']['user']['git_user_email'] = "gitlab@#{node['fqdn']}"
-
 
 ####
 # GitLab Rails app

files/gitlab-cookbooks/gitlab/libraries/gitlab.rb

@@ -109,7 +109,7 @@ module Gitlab
       unless uri.host
         raise "GitLab external URL must include a schema and FQDN, e.g. http://gitlab.example.com/"
       end
-      Gitlab['user']['git_user_email'] ||= "gitlab@#{uri.host}"
+
       Gitlab['gitlab_rails']['gitlab_host'] = uri.host
       Gitlab['gitlab_rails']['gitlab_email_from'] ||= "gitlab@#{uri.host}"
 

files/gitlab-cookbooks/gitlab/templates/default/gitconfig.erb

@@ -1,9 +1,5 @@
 # This file is managed by gitlab-ctl. Manual changes will be
 # erased! To change the contents below, edit /etc/gitlab/gitlab.rb
 # and run `sudo gitlab-ctl reconfigure`.
-
-[user]
-        name = <%= node['gitlab']['user']['git_user_name'] %>
-        email = <%= node['gitlab']['user']['git_user_email'] %>
 [core]
         autocrlf = input