Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 1 deletions

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