Merge branch 'aa-add-trial-field-to-namespaces-api' into 'master'

Add trial field to namespaces API

See merge request gitlab-org/gitlab!24666

ee/changelogs/unreleased/aa-add-trial-field-to-namespaces-api.yml

+---
+title: Add trial field to namespaces API
+merge_request: 24666
+author:
+type: added

ee/lib/ee/api/entities.rb

@@ -170,6 +170,9 @@ module EE
           expose :trial_ends_on, if: can_admin_namespace do |namespace, _|
             namespace.trial_ends_on
           end
+          expose :trial, if: can_admin_namespace do |namespace, _|
+            namespace.trial?
+          end
         end
       end
 

ee/spec/requests/api/namespaces_spec.rb

@@ -22,12 +22,12 @@ describe API::Namespaces do
         expect(group_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
                                                                  'parent_id', 'members_count_with_descendants',
                                                                  'plan', 'shared_runners_minutes_limit',
-                                                                 'avatar_url', 'web_url', 'trial_ends_on',
+                                                                 'avatar_url', 'web_url', 'trial_ends_on', 'trial',
                                                                  'extra_shared_runners_minutes_limit', 'billable_members_count')
 
         expect(user_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
                                                                 'parent_id', 'plan', 'shared_runners_minutes_limit',
-                                                                'avatar_url', 'web_url', 'trial_ends_on',
+                                                                'avatar_url', 'web_url', 'trial_ends_on', 'trial',
                                                                 'extra_shared_runners_minutes_limit', 'billable_members_count')
       end
     end
@@ -41,7 +41,7 @@ describe API::Namespaces do
         owned_group_response = json_response.find { |resource| resource['id'] == group1.id }
 
         expect(owned_group_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path', 'trial_ends_on',
-                                                             'plan', 'parent_id', 'members_count_with_descendants',
+                                                             'plan', 'parent_id', 'members_count_with_descendants', 'trial',
                                                              'avatar_url', 'web_url', 'billable_members_count')
       end