Merge branch 'defaults' into 'master'

Redis defaults

See merge request !42

lib/gitlab_config.rb

@@ -55,6 +55,8 @@ class GitlabConfig
       %W(env -i redis-cli)
     else
       redis['database'] ||= 0
+      redis['host'] ||= '127.0.0.1'
+      redis['port'] ||= '6379'
       if redis.has_key?("socket")
         %W(#{redis['bin']} -s #{redis['socket']} -n #{redis['database']})
       else

lib/gitlab_projects.rb

@@ -105,7 +105,7 @@ class GitlabProjects
   end
 
   def remove_origin_in_repo
-    cmd = %W(git --git-dir=#{full_path} remote remove origin)
+    cmd = %W(git --git-dir=#{full_path} remote rm origin)
     pid = Process.spawn(*cmd)
     Process.wait(pid)
   end