Backport EE change for setting up forked project
This commit is contained in:
parent
5a2acfe036
commit
b0ba158105
|
@ -6,11 +6,7 @@ describe MergeRequests::Conflicts::ResolveService do
|
|||
let(:project) { create(:project, :public, :repository) }
|
||||
|
||||
let(:forked_project) do
|
||||
forked_project = fork_project(project, user)
|
||||
TestEnv.copy_repo(forked_project,
|
||||
bare_repo: TestEnv.forked_repo_path_bare,
|
||||
refs: TestEnv::FORKED_BRANCH_SHA)
|
||||
forked_project
|
||||
fork_project_with_submodules(project, user)
|
||||
end
|
||||
|
||||
let(:merge_request) do
|
||||
|
|
|
@ -52,7 +52,7 @@ module ProjectForksHelper
|
|||
TestEnv.copy_repo(forked_project,
|
||||
bare_repo: TestEnv.forked_repo_path_bare,
|
||||
refs: TestEnv::FORKED_BRANCH_SHA)
|
||||
|
||||
forked_project.repository.after_import
|
||||
forked_project
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue