Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 0 deletions

diff --git a/app/graphql/types/namespace/shared_runners_setting_enum.rb b/app/graphql/types/namespace/shared_runners_setting_enum.rb
new file mode 100644
index 00000000000..4773e414aeb
--- /dev/null
+++ b/app/graphql/types/namespace/shared_runners_setting_enum.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Types
+  class Namespace::SharedRunnersSettingEnum < BaseEnum
+    graphql_name 'SharedRunnersSetting'
+
+    ::Namespace::SHARED_RUNNERS_SETTINGS.each do |type|
+      value type.upcase,
+            description: "Sharing of runners is #{type.tr('_', ' ')}.",
+            value: type
+    end
+  end
+end
diff --git a/app/graphql/types/namespace_type.rb b/app/graphql/types/namespace_type.rb
index da5e4ae0642..4cc543f477a 100644
--- a/app/graphql/types/namespace_type.rb
+++ b/app/graphql/types/namespace_type.rb
@@ -42,6 +42,11 @@ module Types
           null: true,
           description: 'The package settings for the namespace.'
 
+    field :shared_runners_setting,
+          Types::Namespace::SharedRunnersSettingEnum,
+          null: true,
+          description: "Shared runners availability for the namespace and its descendants."
+
     def root_storage_statistics
       Gitlab::Graphql::Loaders::BatchRootStorageStatisticsLoader.new(object.id).find
     end