Merge branch 'fj-include-only-owned-groups-in-sitemap' into 'master'

Include only Gitlab-org owned groups in sitemap

See merge request gitlab-org/gitlab!47608

ee/changelogs/unreleased/fj-include-only-owned-groups-in-sitemap.yml

+---
+title: Include only Gitlab-org owned groups in sitemap
+merge_request: 47608
+author:
+type: changed

ee/lib/gitlab/sitemaps/generator.rb

@@ -56,7 +56,7 @@ module Gitlab
             current_user: nil,
             group: gitlab_org_group,
             params: { non_archived: true },
-            options: { include_subgroups: true }
+            options: { include_subgroups: true, only_owned: true }
           ).execute.include_project_feature.inc_routes
         end
       end

ee/spec/lib/gitlab/sitemaps/generator_spec.rb

@@ -40,8 +40,11 @@ RSpec.describe Gitlab::Sitemaps::Generator do
         let_it_be(:public_subgroup_internal_project) { create(:project, :internal, namespace: public_subgroup) }
         let_it_be(:internal_subgroup_private_project) { create(:project, :private, namespace: internal_subgroup) }
         let_it_be(:internal_subgroup_internal_project) { create(:project, :internal, namespace: internal_subgroup) }
+        let_it_be(:other_project) { create(:project, :public) }
 
         it 'includes default explore routes and gitlab-org group routes' do
+          create(:project_group_link, project: other_project, group: gitlab_org_group)
+
           content = subject.render
 
           expect(content).to include('/explore/projects')
@@ -55,6 +58,7 @@ RSpec.describe Gitlab::Sitemaps::Generator do
           expect(content).not_to include(internal_gitlab_org_project.full_path)
           expect(content).not_to include(private_gitlab_org_project.full_path)
           expect(content).not_to include(internal_subgroup.full_path)
+          expect(content).not_to include(other_project.full_path)
           expect(content).not_to include(public_subgroup_internal_project.full_path)
           expect(content).not_to include(internal_subgroup_private_project.full_path)
           expect(content).not_to include(internal_subgroup_internal_project.full_path)