Merge branch 'shared_with_group_path' into 'master'

Add group ful path to project's shared_with_groups

See merge request gitlab-org/gitlab-ce!24052

changelogs/unreleased/shared_with_group_path.yml

+---
+title: Add group full path to project's shared_with_groups
+merge_request: 24052
+author: Mathieu Parent
+type: added

doc/api/groups.md

@@ -357,12 +357,14 @@ Example response:
         {
           "group_id": 4,
           "group_name": "Twitter",
+          "group_full_path": "twitter",
           "group_access_level": 30,
           "expires_at": null
         },
         {
           "group_id": 3,
           "group_name": "Gitlab Org",
+          "group_full_path": "gitlab-org",
           "group_access_level": 10,
           "expires_at": "2018-08-14"
         }

doc/api/projects.md

@@ -525,11 +525,13 @@ GET /projects/:id
     {
       "group_id": 4,
       "group_name": "Twitter",
+      "group_full_path": "twitter",
       "group_access_level": 30
     },
     {
       "group_id": 3,
       "group_name": "Gitlab Org",
+      "group_full_path": "gitlab-org",
       "group_access_level": 10
     }
   ],

lib/api/entities.rb

@@ -115,6 +115,9 @@ module API
       expose :group_name do |group_link, options|
         group_link.group.name
       end
+      expose :group_full_path do |group_link, options|
+        group_link.group.full_path
+      end
       expose :group_access, as: :group_access_level
       expose :expires_at
     end
@@ -277,7 +280,7 @@ module API
         # N+1 is solved then by using `subject.tags.map(&:name)`
         # MR describing the solution: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20555
         super(projects_relation).preload(:group)
-                                .preload(project_group_links: :group,
+                                .preload(project_group_links: { group: :route },
                                          fork_network: :root_project,
                                          fork_network_member: :forked_from_project,
                                          forked_from_project: [:route, :forks, :tags, namespace: :route])

spec/requests/api/projects_spec.rb

@@ -948,6 +948,7 @@ describe API::Projects do
         expect(json_response['shared_with_groups'].length).to eq(1)
         expect(json_response['shared_with_groups'][0]['group_id']).to eq(group.id)
         expect(json_response['shared_with_groups'][0]['group_name']).to eq(group.name)
+        expect(json_response['shared_with_groups'][0]['group_full_path']).to eq(group.full_path)
         expect(json_response['shared_with_groups'][0]['group_access_level']).to eq(link.group_access)
         expect(json_response['shared_with_groups'][0]['expires_at']).to be_nil
         expect(json_response['only_allow_merge_if_pipeline_succeeds']).to eq(project.only_allow_merge_if_pipeline_succeeds)
@@ -967,6 +968,7 @@ describe API::Projects do
         expect(json_response['shared_with_groups'].length).to eq(1)
         expect(json_response['shared_with_groups'][0]['group_id']).to eq(group.id)
         expect(json_response['shared_with_groups'][0]['group_name']).to eq(group.name)
+        expect(json_response['shared_with_groups'][0]['group_full_path']).to eq(group.full_path)
         expect(json_response['shared_with_groups'][0]['group_access_level']).to eq(link.group_access)
         expect(json_response['shared_with_groups'][0]['expires_at']).to eq(expires_at.to_s)
       end