summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSato Hiroyuki <sathiroyuki@gmail.com>2013-04-24 04:45:59 +0900
committerSato Hiroyuki <sathiroyuki@gmail.com>2013-05-07 17:20:36 +0900
commit9214962d2476ba287b76241f4ccc1223cccc0cb1 (patch)
treec9139205cd1d4e92f222f1dbab91d680afb94c1a /config
parentb5461e0c56fefea1fd307996a1f517899273c920 (diff)
downloadgitlab-ce-9214962d2476ba287b76241f4ccc1223cccc0cb1.tar.gz
Fix not using git.bin_path in config.
Closing #3614" and "Closing #3574.
Diffstat (limited to 'config')
-rw-r--r--config/initializers/3_grit_ext.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/3_grit_ext.rb b/config/initializers/3_grit_ext.rb
index 097c301a06a..95d04e8da9c 100644
--- a/config/initializers/3_grit_ext.rb
+++ b/config/initializers/3_grit_ext.rb
@@ -1,6 +1,7 @@
require 'grit'
require 'pygments'
+Grit::Git.git_binary = Gitlab.config.git.bin_path
Grit::Git.git_timeout = Gitlab.config.git.timeout
Grit::Git.git_max_size = Gitlab.config.git.max_size