Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

1 files changed, 25 insertions, 0 deletions

diff --git a/lib/api/entities/project_integration.rb b/lib/api/entities/project_integration.rb
new file mode 100644
index 00000000000..649e4d015b8
--- /dev/null
+++ b/lib/api/entities/project_integration.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class ProjectIntegration < Entities::ProjectIntegrationBasic
+      # Expose serialized properties
+      expose :properties do |integration, options|
+        # TODO: Simplify as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
+
+        attributes =
+          if integration.data_fields_present?
+            integration.data_fields.as_json.keys
+          else
+            integration.properties.keys
+          end
+
+        attributes &= integration.api_field_names
+
+        attributes.each_with_object({}) do |attribute, hash|
+          hash[attribute] = integration.public_send(attribute) # rubocop:disable GitlabSecurity/PublicSend
+        end
+      end
+    end
+  end
+end