diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 15:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 15:09:12 +0300 |
| commit | cbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2 (patch) | |
| tree | e4879b35d019d3bbba1689f3ac4c48b81bf7b451 /app/services | |
| parent | 3fd97b4bba24ca412112aad025a38a32c7a6cf8c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/ci/update_ci_ref_status_service.rb | 2 | ||||
| -rw-r--r-- | app/services/projects/update_repository_storage_service.rb | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/app/services/ci/update_ci_ref_status_service.rb b/app/services/ci/update_ci_ref_status_service.rb index e5e5b94b629..4f7ac4d11b0 100644 --- a/app/services/ci/update_ci_ref_status_service.rb +++ b/app/services/ci/update_ci_ref_status_service.rb @@ -22,7 +22,7 @@ module Ci begin retry_optimistic_lock(ref) do next false if ref.persisted? && - (ref.last_updated_by_pipeline_id || 0) >= pipeline.id + (ref.last_updated_by_pipeline_id || 0) > pipeline.id ref.update(status: next_status(ref.status, pipeline.status), last_updated_by_pipeline: pipeline) diff --git a/app/services/projects/update_repository_storage_service.rb b/app/services/projects/update_repository_storage_service.rb index 0adfd4f8fd7..0602089a3ab 100644 --- a/app/services/projects/update_repository_storage_service.rb +++ b/app/services/projects/update_repository_storage_service.rb @@ -52,11 +52,14 @@ module Projects checksum = repository.checksum # Initialize a git repository on the target path - gitlab_shell.create_repository(new_storage_key, raw_repository.relative_path, full_path) - new_repository = Gitlab::Git::Repository.new(new_storage_key, - raw_repository.relative_path, - raw_repository.gl_repository, - full_path) + new_repository = Gitlab::Git::Repository.new( + new_storage_key, + raw_repository.relative_path, + raw_repository.gl_repository, + full_path + ) + + new_repository.create_repository new_repository.replicate(raw_repository) new_checksum = new_repository.checksum |