Merge remote-tracking branch 'gitlabhq/master' into git_commit_fix

Conflicts: doc/install/installation.md
2012-11-11 21:27:55 +11:00 · 2012-11-11 21:27:55 +11:00 · 93f0a8c9b3
commit 93f0a8c9b3
parent 944d3823c3 3c7806c3f2
369 changed files with 102667 additions and 1369 deletions
--- a/lib/gitlab/backend/gitolite_config.rb
+++ b/lib/gitlab/backend/gitolite_config.rb
@ -14,7 +14,10 @@ module Gitlab
    end

    def ga_repo
-      @ga_repo ||= ::Gitolite::GitoliteAdmin.new(File.join(config_tmp_dir,'gitolite'))
+      @ga_repo ||= ::Gitolite::GitoliteAdmin.new(
+        File.join(config_tmp_dir,'gitolite'),
+        conf: Gitlab.config.gitolite_config_file
+      )
    end

    def apply