diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-12 14:29:25 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-07-12 14:29:25 +0000 |
| commit | 158786caae7d025b2797008926cfd7d519367b87 (patch) | |
| tree | 2146af0260ec07e31fe5608222eb6317b7c4238a /spec/models/commit_status_spec.rb | |
| parent | 6820fdff7d8503e6756512071d64246d933caa9c (diff) | |
| parent | 0736397e0849333053390a24aa3938cda45707cf (diff) | |
| download | gitlab-ce-158786caae7d025b2797008926cfd7d519367b87.tar.gz | |
Merge branch '19711-many-git-gc-instances' into 'master'
Reset project pushes_since_gc when we enqueue the git gc call
## What does this MR do?
Reset counters just when we really enqueue the `git gc` command. So as this is part of the `#execute`method we throttle the enqueue and the reset (database statement) as we throttle the `#increment!` call. And we only call `#execute` if it's needed.
## What are the relevant issue numbers?
Closes #19711
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5201
Diffstat (limited to 'spec/models/commit_status_spec.rb')
0 files changed, 0 insertions, 0 deletions