Skip to content
代码片段 群组 项目
未验证 提交 2c69116e 编辑于 作者: Vitali Tatarintev's avatar Vitali Tatarintev 提交者: GitLab
浏览文件

Merge branch 'mk/remove-no-longer-needed-check' into 'master'

No related branches found
No related tags found
无相关合并请求
...@@ -23,10 +23,8 @@ module RegistryType ...@@ -23,10 +23,8 @@ module RegistryType
field :verification_checksum, GraphQL::Types::String, null: true, description: "The local checksum of the #{graphql_name}" field :verification_checksum, GraphQL::Types::String, null: true, description: "The local checksum of the #{graphql_name}"
field :verification_failure, GraphQL::Types::String, null: true, description: "Error message during verification of the #{graphql_name}" field :verification_failure, GraphQL::Types::String, null: true, description: "Error message during verification of the #{graphql_name}"
# NOTE: remove respond_to? when GroupWikiRepositoryRegistry includes the verification state machine
# Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/323897
def verification_state_name_value def verification_state_name_value
object.verification_state_name.to_s.gsub('verification_', '') if object.respond_to?(:verification_state_name) object.verification_state_name.to_s.gsub('verification_', '')
end end
end end
end end
......
...@@ -132,13 +132,7 @@ def verification_data_to_registry_hash(data, registry) ...@@ -132,13 +132,7 @@ def verification_data_to_registry_hash(data, registry)
data['verificationFailure'] = registry.verification_failure data['verificationFailure'] = registry.verification_failure
data['verificationRetryCount'] = registry.verification_retry_count data['verificationRetryCount'] = registry.verification_retry_count
data['verificationStartedAt'] = registry.verification_started_at data['verificationStartedAt'] = registry.verification_started_at
data['verificationState'] = registry.verification_state_name.to_s.gsub('verification_', '').upcase
# NOTE: remove respond_to? when GroupWikiRepositoryRegistry includes the verification state machine
# Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/323897
data['verificationState'] = if registry.respond_to?(:verification_state_name)
registry.verification_state_name.to_s.gsub('verification_', '').upcase
end
data['verifiedAt'] = registry.verified_at if verification_enabled data['verifiedAt'] = registry.verified_at if verification_enabled
data['verificationRetryAt'] = registry.verification_retry_at if verification_enabled data['verificationRetryAt'] = registry.verification_retry_at if verification_enabled
data data
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册