diff options
| author | DJ Mountney <david@twkie.net> | 2017-04-03 15:54:56 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-04-03 15:54:56 -0700 |
| commit | 4eb27a395902c001d1883c0379516cc79dc65402 (patch) | |
| tree | a46b7b987052ad09141a67e6c76e2dbf9b2a171d | |
| parent | 75e6580af4e4569a273a2d79f02c78e8246555d6 (diff) | |
| download | gitlab-ce-4eb27a395902c001d1883c0379516cc79dc65402.tar.gz | |
Fix bad merge of one of the spec files
| -rw-r--r-- | spec/lib/gitlab/github_import/importer_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/github_import/importer_spec.rb b/spec/lib/gitlab/github_import/importer_spec.rb index 85ee2b77b6b..c131f325c0c 100644 --- a/spec/lib/gitlab/github_import/importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer_spec.rb @@ -130,9 +130,9 @@ describe Gitlab::GithubImport::Importer, lib: true do let!(:user) { create(:user, email: octocat.email) } let(:repository) { double(id: 1, fork: false) } let(:source_sha) { create(:commit, project: project).id } - let(:source_branch) { double(ref: 'feature', repo: repository, sha: source_sha, user: octoca) } + let(:source_branch) { double(ref: 'feature', repo: repository, sha: source_sha, user: octocat) } let(:target_sha) { create(:commit, project: project, git_commit: RepoHelpers.another_sample_commit).id } - let(:target_branch) { double(ref: 'master', repo: repository, sha: target_sha, user: octoca) } + let(:target_branch) { double(ref: 'master', repo: repository, sha: target_sha, user: octocat) } let(:pull_request) do double( number: 1347, |