diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-08 11:17:48 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-08 11:17:48 -0700 |
| commit | 6d204544a1fb15b4c8d5abc36a291649e480a116 (patch) | |
| tree | 47537ae2d2fd7ea4247b29148324910718485394 /config | |
| parent | 2ddd6d952b48fd0bd3364d1a22c0a4fbb4ad56f7 (diff) | |
| parent | 9214962d2476ba287b76241f4ccc1223cccc0cb1 (diff) | |
| download | gitlab-ce-6d204544a1fb15b4c8d5abc36a291649e480a116.tar.gz | |
Merge pull request #3687 from hiroponz/fix-not-using-git-bin-path
Fix not using git.bin_path in config.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/3_grit_ext.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/3_grit_ext.rb b/config/initializers/3_grit_ext.rb index 2728f51c3ea..8b298e821e7 100644 --- a/config/initializers/3_grit_ext.rb +++ b/config/initializers/3_grit_ext.rb @@ -1,5 +1,6 @@ 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 |