diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-01-02 16:24:37 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-01-02 16:24:37 -0700 |
| commit | 0a074f2e091d8b2f1bce49e50ecf69b667c62dc2 (patch) | |
| tree | 314027556f06514278a4f83f35813c00b2d5418f /spec/factories | |
| parent | 588219352c99213d099aff72f32d6ad9ec4830d4 (diff) | |
| parent | de25604fbca2f7005754d821d571bbcb1cc510ac (diff) | |
| download | gitlab-ce-0a074f2e091d8b2f1bce49e50ecf69b667c62dc2.tar.gz | |
fix pipelines/index.html.haml merge conflict
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/lfs_objects.rb | 2 | ||||
| -rw-r--r-- | spec/factories/project_statistics.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/spec/factories/lfs_objects.rb b/spec/factories/lfs_objects.rb index a81645acd2b..477fab9e964 100644 --- a/spec/factories/lfs_objects.rb +++ b/spec/factories/lfs_objects.rb @@ -2,7 +2,7 @@ include ActionDispatch::TestProcess FactoryGirl.define do factory :lfs_object do - oid "b68143e6463773b1b6c6fd009a76c32aeec041faff32ba2ed42fd7f708a17f80" + sequence(:oid) { |n| "b68143e6463773b1b6c6fd009a76c32aeec041faff32ba2ed42fd7f708a%05x" % n } size 499013 end diff --git a/spec/factories/project_statistics.rb b/spec/factories/project_statistics.rb new file mode 100644 index 00000000000..72d43096216 --- /dev/null +++ b/spec/factories/project_statistics.rb @@ -0,0 +1,6 @@ +FactoryGirl.define do + factory :project_statistics do + project { create :project } + namespace { project.namespace } + end +end |