From a6c2be7cd20a9515b347e72d63c5b47bb9b79457 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 21 Feb 2020 21:08:57 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/projects/update_pages_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/services/projects/update_pages_service.rb') diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb index 8b23f610ad1..59389a0fa65 100644 --- a/app/services/projects/update_pages_service.rb +++ b/app/services/projects/update_pages_service.rb @@ -27,7 +27,7 @@ module Projects @status.run! raise InvalidStateError, 'missing pages artifacts' unless build.artifacts? - raise InvalidStateError, 'pages are outdated' unless latest? + raise InvalidStateError, 'build SHA is outdated for this ref' unless latest? # Create temporary directory in which we will extract the artifacts make_secure_tmp_dir(tmp_path) do |archive_path| @@ -36,7 +36,7 @@ module Projects # Check if we did extract public directory archive_public_path = File.join(archive_path, PUBLIC_DIR) raise InvalidStateError, 'pages miss the public folder' unless Dir.exist?(archive_public_path) - raise InvalidStateError, 'pages are outdated' unless latest? + raise InvalidStateError, 'build SHA is outdated for this ref' unless latest? deploy_page!(archive_public_path) success -- cgit v1.2.1