summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-20 12:23:14 +0000
committerRémy Coutable <remy@rymai.me>2016-09-20 12:23:14 +0000
commitfb4d2f9e5a5828a05b4c68702c927439e4be648e (patch)
tree151d6788f51f7d57fdbe8a9ce5ee8f77fcc00ddd /spec/lib/gitlab
parent4276172b6977bb83de2dc86ecccd48984e09955c (diff)
parentc00e79d4e3f83eac13146837244bbbcfa420bfd7 (diff)
downloadgitlab-ce-fb4d2f9e5a5828a05b4c68702c927439e4be648e.tar.gz
Merge branch 'feature/github-edit-path' into 'master'
Lets the user choose a namespace and name on Github imports Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14971 See merge request !5728
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r--spec/lib/gitlab/github_import/project_creator_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/github_import/project_creator_spec.rb b/spec/lib/gitlab/github_import/project_creator_spec.rb
index 014ee462e5c..ab06b7bc5bb 100644
--- a/spec/lib/gitlab/github_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/github_import/project_creator_spec.rb
@@ -13,7 +13,7 @@ describe Gitlab::GithubImport::ProjectCreator, lib: true do
)
end
- subject(:service) { described_class.new(repo, namespace, user, github_access_token: 'asdffg') }
+ subject(:service) { described_class.new(repo, repo.name, namespace, user, github_access_token: 'asdffg') }
before do
namespace.add_owner(user)