Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 12 insertions, 1 deletions

diff --git a/app/graphql/types/namespace/shared_runners_setting_enum.rb b/app/graphql/types/namespace/shared_runners_setting_enum.rb
index 4773e414aeb..fd067c9d803 100644
--- a/app/graphql/types/namespace/shared_runners_setting_enum.rb
+++ b/app/graphql/types/namespace/shared_runners_setting_enum.rb
@@ -4,10 +4,21 @@ module Types
   class Namespace::SharedRunnersSettingEnum < BaseEnum
     graphql_name 'SharedRunnersSetting'
 
-    ::Namespace::SHARED_RUNNERS_SETTINGS.each do |type|
+    DEPRECATED_SETTINGS = [::Namespace::SR_DISABLED_WITH_OVERRIDE].freeze
+
+    ::Namespace::SHARED_RUNNERS_SETTINGS.excluding(DEPRECATED_SETTINGS).each do |type|
       value type.upcase,
             description: "Sharing of runners is #{type.tr('_', ' ')}.",
             value: type
     end
+
+    value ::Namespace::SR_DISABLED_WITH_OVERRIDE.upcase,
+          description: "Sharing of runners is disabled and overridable.",
+          value: ::Namespace::SR_DISABLED_WITH_OVERRIDE,
+          deprecated: {
+            reason: :renamed,
+            replacement: ::Namespace::SR_DISABLED_AND_OVERRIDABLE,
+            milestone: "17.0"
+          }
   end
 end