Commit 290285d2 authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'ce-to-ee' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee

parents b2a60a2f 25fe0ae8
......@@ -52,11 +52,7 @@ module ProjectForksHelper
TestEnv.copy_repo(forked_project,
bare_repo: TestEnv.forked_repo_path_bare,
refs: TestEnv::FORKED_BRANCH_SHA)
<<<<<<< HEAD
forked_project.repository.after_import
=======
>>>>>>> ce-com/master
forked_project
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment