Commit e172028a authored by James Lopez's avatar James Lopez

Merge branches 'feature/project-export' and 'feature/project-import' of...

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
parents 6139e143 1990616a
...@@ -21,7 +21,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do ...@@ -21,7 +21,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
labels: [label], labels: [label],
snippets: [snippet], snippets: [snippet],
releases: [release] releases: [release]
) )
end end
let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch, statuses: [commit_status]) } let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch, statuses: [commit_status]) }
let!(:milestone) { create(:milestone, title: "Milestone v1.2", project: project) } let!(:milestone) { create(:milestone, title: "Milestone v1.2", project: project) }
......
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