From fd1c75caebf0eae26d2298c68aaeac3c940f84d9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 2 Aug 2022 03:09:33 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- tooling/graphql/docs/helper.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tooling/graphql') diff --git a/tooling/graphql/docs/helper.rb b/tooling/graphql/docs/helper.rb index e4f14129f3b..a76773ed28d 100644 --- a/tooling/graphql/docs/helper.rb +++ b/tooling/graphql/docs/helper.rb @@ -315,14 +315,17 @@ module Tooling def render_deprecation(object, owner, context) buff = [] deprecation = schema_deprecation(owner, object[:name]) + original_description = deprecation&.original_description || render_description_of(object, owner) - buff << (deprecation&.original_description || render_description_of(object, owner)) if context == :block + buff << original_description if context == :block buff << if deprecation deprecation.markdown(context: context) else "**Deprecated:** #{object[:deprecation_reason]}" end + buff << original_description if context == :inline && deprecation&.alpha? + join(context, buff) end -- cgit v1.2.1