summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-08-31 07:03:12 +0000
committerDouwe Maan <douwe@gitlab.com>2017-08-31 07:03:12 +0000
commiteacda4cc98933c2c9bfd4935b289eee79da516dd (patch)
treec3f42466af59edd6f6ff0da7b8334e75112221a2 /spec/factories
parentf7c8434c7100c3c87eb2a75cd5a128e520d8c110 (diff)
parenta882026bdfc770ecfac70bfc88a409ec010f06c9 (diff)
downloadgitlab-ce-eacda4cc98933c2c9bfd4935b289eee79da516dd.tar.gz
Merge branch '36743-existing-repo-master' into 'master'
[master] Prevent project creation (blank, import or fork) when repository already exists on disk See merge request gitlab/gitlabhq!2169
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/projects.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 9ebda0ba03b..7493b0a8b35 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -101,8 +101,6 @@ FactoryGirl.define do
# Test repository - https://gitlab.com/gitlab-org/gitlab-test
trait :repository do
- path { 'gitlabhq' }
-
test_repo
transient do