Merge branch 'master' into '24196-protected-variables'

# Conflicts:
#   db/schema.rb

1 files changed, 22 insertions, 0 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 620e3409d6f..8d9de8c388d 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -754,6 +754,28 @@ module API
       expose :impersonation
     end
 
+    class FeatureGate < Grape::Entity
+      expose :key
+      expose :value
+    end
+
+    class Feature < Grape::Entity
+      expose :name
+      expose :state
+      expose :gates, using: FeatureGate do |model|
+        model.gates.map do |gate|
+          value = model.gate_values[gate.key]
+
+          # By default all gate values are populated. Only show relevant ones.
+          if (value.is_a?(Integer) && value.zero?) || (value.is_a?(Set) && value.empty?)
+            next
+          end
+
+          { key: gate.key, value: value }
+        end.compact
+      end
+    end
+
     module JobRequest
       class JobInfo < Grape::Entity
         expose :name, :stage