diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-19 14:01:44 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-19 14:01:44 +0300 |
| commit | ffc505d2170fff93607e37f3a634984b90549436 (patch) | |
| tree | 62c9cd0a044b226dae32fcb9ad61cfb5bba8ee07 /lib/api | |
| parent | e2b8337f12a45219548c37287e3929e751e4704d (diff) | |
| parent | f3fba178b931cd2ba67f81ee667893cb84e7d42f (diff) | |
Merge branch 'bvl-remove-forked-project-link' into 'master'
Remove ForkedProjectLink model
Closes #38883
See merge request gitlab-org/gitlab-ce!22226
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 5a4b85f98cf..65855e8aac4 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -260,7 +260,7 @@ module API super(projects_relation).preload(:group) .preload(project_group_links: :group, fork_network: :root_project, - forked_project_link: :forked_from_project, + fork_network_member: :forked_from_project, forked_from_project: [:route, :forks, :tags, namespace: :route]) end # rubocop: enable CodeReuse/ActiveRecord |