diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 21:00:40 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 21:00:40 +0100 |
| commit | 8b98ca50b3068fecc76233714fa7d363703ee55c (patch) | |
| tree | 97d67331552de76faa9bfb8cec11616a369351fe /features | |
| parent | 501d403202d8b4f603dd1864790f56e85633b8ef (diff) | |
| parent | d37f1f1cd013a8b7a307e1004e020df086cba9d5 (diff) | |
| download | gitlab-ce-8b98ca50b3068fecc76233714fa7d363703ee55c.tar.gz | |
Merge branch 'master' into new-resolvable-discussion
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/shared/project.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb index 4ee879fe922..73206c3f30d 100644 --- a/features/steps/shared/project.rb +++ b/features/steps/shared/project.rb @@ -251,7 +251,8 @@ module SharedProject step 'project "Shop" has CI build' do project = Project.find_by(name: "Shop") - create :ci_pipeline, project: project, sha: project.commit.sha, ref: 'master', status: 'skipped' + pipeline = create :ci_pipeline, project: project, sha: project.commit.sha, ref: 'master' + pipeline.skip end step 'I should see last commit with CI status' do |