diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-11 16:20:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-11 16:20:01 +0000 |
| commit | e39aef7340defb12d565934576134b26d483cc3a (patch) | |
| tree | 3769e0c7e9a5af31ac02f5837db6471e901a3a67 | |
| parent | a6d09bc6524a0bfefda04bdb7006818986f01de7 (diff) | |
| parent | b0ba15810553ac8570f0f52cc6f7e48507b96db9 (diff) | |
| download | gitlab-ce-e39aef7340defb12d565934576134b26d483cc3a.tar.gz | |
Merge branch 'backport-ee-change-for-test' into 'master'
Backport EE change for setting up forked project
See merge request gitlab-org/gitlab-ce!14817
| -rw-r--r-- | spec/services/merge_requests/conflicts/resolve_service_spec.rb | 6 | ||||
| -rw-r--r-- | spec/support/project_forks_helper.rb | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/spec/services/merge_requests/conflicts/resolve_service_spec.rb b/spec/services/merge_requests/conflicts/resolve_service_spec.rb index 9c9b0c4c4a1..a1f7dc44d31 100644 --- a/spec/services/merge_requests/conflicts/resolve_service_spec.rb +++ b/spec/services/merge_requests/conflicts/resolve_service_spec.rb @@ -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 diff --git a/spec/support/project_forks_helper.rb b/spec/support/project_forks_helper.rb index 0d1c6792d13..d6680735aa1 100644 --- a/spec/support/project_forks_helper.rb +++ b/spec/support/project_forks_helper.rb @@ -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 |