From f3fba178b931cd2ba67f81ee667893cb84e7d42f Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Fri, 31 Aug 2018 19:16:34 +0200 Subject: Remove the `ForkedProjectLink` model This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted. --- spec/requests/api/projects_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/requests') diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index c8e98e6024c..22e5a7c7174 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -1196,7 +1196,7 @@ describe API::Projects do expect(response).to have_gitlab_http_status(201) expect(project_fork_target.forked_from_project.id).to eq(project_fork_source.id) - expect(project_fork_target.forked_project_link).to be_present + expect(project_fork_target.fork_network_member).to be_present expect(project_fork_target).to be_forked end -- cgit v1.2.1