Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 2 deletions

diff --git a/lib/gitlab/graphql/deprecation.rb b/lib/gitlab/graphql/deprecation.rb
index d30751fe46e..7ba339d4191 100644
--- a/lib/gitlab/graphql/deprecation.rb
+++ b/lib/gitlab/graphql/deprecation.rb
@@ -21,8 +21,18 @@ module Gitlab
       validate :milestone_is_string
       validate :reason_known_or_string
 
-      def self.parse(options)
-        new(**options) if options
+      def self.parse(alpha: nil, deprecated: nil)
+        options = alpha || deprecated
+        return unless options
+
+        if alpha
+          raise ArgumentError, '`alpha` and `deprecated` arguments cannot be passed at the same time' \
+            if deprecated
+
+          options[:reason] = :alpha
+        end
+
+        new(**options)
       end
 
       def initialize(reason: nil, milestone: nil, replacement: nil)