summaryrefslogtreecommitdiff
path: root/app/models/container_repository.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-07-20 15:40:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-07-20 15:40:28 +0000
commitb595cb0c1dec83de5bdee18284abe86614bed33b (patch)
tree8c3d4540f193c5ff98019352f554e921b3a41a72 /app/models/container_repository.rb
parent2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff)
downloadgitlab-ce-b595cb0c1dec83de5bdee18284abe86614bed33b.tar.gz
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'app/models/container_repository.rb')
-rw-r--r--app/models/container_repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index c965d7cffe1..cdfd24e00aa 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -468,7 +468,7 @@ class ContainerRepository < ApplicationRecord
def size
strong_memoize(:size) do
next unless Gitlab.com?
- next if self.created_at.before?(MIGRATION_PHASE_1_STARTED_AT)
+ next if self.created_at.before?(MIGRATION_PHASE_1_STARTED_AT) && self.migration_state != 'import_done'
next unless gitlab_api_client.supports_gitlab_api?
gitlab_api_client.repository_details(self.path, sizing: :self)['size_bytes']