diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-01 07:25:48 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-01 07:25:48 +0000 |
| commit | 3cc138d824df039af2d7dae2ae04c30e98b51af1 (patch) | |
| tree | e7b16ba807cad3231b69457bcc71ccbb1b74c4ce /spec/factories | |
| parent | 17c926313a242c6ad988a7ffd55aa6330c8aacfd (diff) | |
| parent | dd0f8b8ccc3b5f61e31703f7391a919b702934a5 (diff) | |
| download | gitlab-ce-3cc138d824df039af2d7dae2ae04c30e98b51af1.tar.gz | |
Merge branch 'master' into '24196-protected-variables'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/ci/pipelines.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb index 361c5b9a49e..03e3c62effe 100644 --- a/spec/factories/ci/pipelines.rb +++ b/spec/factories/ci/pipelines.rb @@ -1,5 +1,6 @@ FactoryGirl.define do factory :ci_empty_pipeline, class: Ci::Pipeline do + source :push ref 'master' sha '97de212e80737a608d939f648d959671fb0a0142' status 'pending' |