diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-02 18:09:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-02 18:09:11 +0300 |
| commit | 97d12c74e9ac60960c8dfc35cf5502d815d84b83 (patch) | |
| tree | 359215d715be4565b6c5cc9ff8055d9a55291dd6 /app/services/merge_requests | |
| parent | 3d58e50a8fd9d07ebe115fc10ff1404e04f6f756 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/cleanup_refs_service.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/services/merge_requests/cleanup_refs_service.rb b/app/services/merge_requests/cleanup_refs_service.rb index 2094ea00160..5081655601b 100644 --- a/app/services/merge_requests/cleanup_refs_service.rb +++ b/app/services/merge_requests/cleanup_refs_service.rb @@ -16,7 +16,6 @@ module MergeRequests @merge_request = merge_request @repository = merge_request.project.repository @ref_path = merge_request.ref_path - @merge_ref_path = merge_request.merge_ref_path @ref_head_sha = @repository.commit(merge_request.ref_path)&.id @merge_ref_sha = merge_request.merge_ref_head&.id end @@ -42,7 +41,7 @@ module MergeRequests private - attr_reader :repository, :ref_path, :merge_ref_path, :ref_head_sha, :merge_ref_sha + attr_reader :repository, :ref_path, :ref_head_sha, :merge_ref_sha def scheduled? merge_request.cleanup_schedule.present? && merge_request.cleanup_schedule.scheduled_at <= Time.current @@ -79,7 +78,7 @@ module MergeRequests end def delete_refs - repository.delete_refs(ref_path, merge_ref_path) + merge_request.schedule_cleanup_refs end def update_schedule |