1 files changed, 2 insertions, 13 deletions
diff --git a/lib/api/entities/project_integration.rb b/lib/api/entities/project_integration.rb
index 649e4d015b8..155136d2f80 100644
--- a/lib/api/entities/project_integration.rb
+++ b/lib/api/entities/project_integration.rb
@@ -5,19 +5,8 @@ module API
     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
+        integration.api_field_names.to_h do |name|
+          [name, integration.public_send(name)] # rubocop:disable GitlabSecurity/PublicSend
         end
       end
     end