diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-03-02 23:14:02 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-03-02 23:14:02 +0000 |
| commit | 9398f64563bd4526a1ba3e20765d8791898990fc (patch) | |
| tree | 756bff252b6a0233667b26854c89785cd0c7dfe4 /spec/factories | |
| parent | b01a78dc8a8401adfaad6abce7c564992e34659e (diff) | |
| parent | e26b4f0c1e2a35331bb9ec83fdb36829f2210ba9 (diff) | |
| download | gitlab-ce-9398f64563bd4526a1ba3e20765d8791898990fc.tar.gz | |
Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master'
Fix creating a file in an empty repo using the API
Closes #28626
See merge request !9632
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/projects.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index 586efdefdb3..04de3512125 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -39,6 +39,10 @@ FactoryGirl.define do trait :empty_repo do after(:create) do |project| project.create_repository + + # We delete hooks so that gitlab-shell will not try to authenticate with + # an API that isn't running + FileUtils.rm_r(File.join(project.repository_storage_path, "#{project.path_with_namespace}.git", 'hooks')) end end |