diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-07 14:29:42 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-07 14:29:42 +0000 |
| commit | 45e0565f98f3224caa2221b4cf83bd720a170dd5 (patch) | |
| tree | 6e0377f59675c07fe2cc7203ab5696ae68c837e2 | |
| parent | e8e9471c6171a8e7f38318f569eda67f9873c448 (diff) | |
| parent | 3e26f6b00f702d1430aed1b6a51b1923ce7ccb71 (diff) | |
| download | gitlab-ce-45e0565f98f3224caa2221b4cf83bd720a170dd5.tar.gz | |
Merge branch 'no-gc-auto' into 'master'
Disable git gc --auto
See merge request !3572
| -rw-r--r-- | doc/install/installation.md | 6 | ||||
| -rw-r--r-- | doc/update/8.6-to-8.7.md | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index e0a16df09c1..f8f7d6a9ebe 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -283,9 +283,13 @@ sudo usermod -aG redis git # Copy the example Rack attack config sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb - # Configure Git global settings for git user, used when editing via web editor + # Configure Git global settings for git user + # 'autocrlf' is needed for the web editor sudo -u git -H git config --global core.autocrlf input + # Disable 'git gc --auto' because GitLab already runs 'git gc' when needed + sudo -u git -H git config --global gc.auto 0 + # Configure Redis connection settings sudo -u git -H cp config/resque.yml.example config/resque.yml diff --git a/doc/update/8.6-to-8.7.md b/doc/update/8.6-to-8.7.md index 76eee147c72..8599133a726 100644 --- a/doc/update/8.6-to-8.7.md +++ b/doc/update/8.6-to-8.7.md @@ -86,6 +86,14 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS ### 7. Update configuration files +#### Git configuration + +Disable `git gc --auto` because GitLab runs `git gc` for us already. + +```sh +sudo -u git -H git config --global gc.auto 0 +``` + #### Nginx configuration Ensure you're still up-to-date with the latest NGINX configuration changes: |