diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-06-01 10:56:00 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-06-01 15:54:58 +0200 |
| commit | 6c87239653e78ca5aaff9bb19424895c621bf7a1 (patch) | |
| tree | a098f6a984fc0a4c6813d873bf055cb10826e673 /spec/serializers/pipeline_details_entity_spec.rb | |
| parent | 5fdb51240f2093342b0ff0930b8d3798446e0026 (diff) | |
| parent | dd0f8b8ccc3b5f61e31703f7391a919b702934a5 (diff) | |
| download | gitlab-ce-6c87239653e78ca5aaff9bb19424895c621bf7a1.tar.gz | |
Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-time
Diffstat (limited to 'spec/serializers/pipeline_details_entity_spec.rb')
| -rw-r--r-- | spec/serializers/pipeline_details_entity_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/serializers/pipeline_details_entity_spec.rb b/spec/serializers/pipeline_details_entity_spec.rb index ac8d8fa8662..03cc5ae9b63 100644 --- a/spec/serializers/pipeline_details_entity_spec.rb +++ b/spec/serializers/pipeline_details_entity_spec.rb @@ -34,7 +34,7 @@ describe PipelineDetailsEntity do it 'contains flags' do expect(subject).to include :flags expect(subject[:flags]) - .to include :latest, :triggered, :stuck, + .to include :latest, :stuck, :yaml_errors, :retryable, :cancelable end end |