diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-02 23:26:35 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-02 23:26:35 +0000 |
| commit | e7d530a624fbb8854047c3983eaa0972a19f36c8 (patch) | |
| tree | 92f77913a359ccf4078cf010add02d8b8f765490 /spec/workers | |
| parent | dce77b1d6d5e2b82441a685d385ee809c6b35b76 (diff) | |
| parent | 54fca95160389fe7993df5d82635b83804833fee (diff) | |
| download | gitlab-ce-e7d530a624fbb8854047c3983eaa0972a19f36c8.tar.gz | |
Merge branch 'fix-git-hooks-when-creating-file' into 'master'
Don't execute git hooks if you create branch as part of other change
Closes #23439
See merge request !7237
Diffstat (limited to 'spec/workers')
| -rw-r--r-- | spec/workers/git_garbage_collect_worker_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb index e471a68a49a..5ef8cf1105b 100644 --- a/spec/workers/git_garbage_collect_worker_spec.rb +++ b/spec/workers/git_garbage_collect_worker_spec.rb @@ -107,7 +107,8 @@ describe GitGarbageCollectWorker do tree: old_commit.tree, parents: [old_commit], ) - project.repository.update_ref!( + GitOperationService.new(nil, project.repository).send( + :update_ref, "refs/heads/#{SecureRandom.hex(6)}", new_commit_sha, Gitlab::Git::BLANK_SHA |