diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 11:21:39 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 11:21:39 +0200 |
| commit | 842f0a3401de8d358fce850df288d9822e523c6e (patch) | |
| tree | cd2abb1bce23b10199dd08eda4e5f98798746019 /spec/requests/ci/api | |
| parent | 836061ddfde6652c1e240ac093c32b9d95b8cd84 (diff) | |
| parent | 7ad7e10feed624e263b5b80f5cafd4b0ed900ad7 (diff) | |
| download | gitlab-ce-842f0a3401de8d358fce850df288d9822e523c6e.tar.gz | |
Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2
# Conflicts:
# features/steps/shared/builds.rb
# spec/requests/ci/api/builds_spec.rb
Diffstat (limited to 'spec/requests/ci/api')
| -rw-r--r-- | spec/requests/ci/api/builds_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb index e8508f8f950..88271642532 100644 --- a/spec/requests/ci/api/builds_spec.rb +++ b/spec/requests/ci/api/builds_spec.rb @@ -85,7 +85,7 @@ describe Ci::API::API do trigger = FactoryGirl.create(:ci_trigger, project: project) pipeline = FactoryGirl.create(:ci_pipeline, project: project, ref: 'master') - trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) + trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, commit: pipeline, trigger: trigger) pipeline.create_builds(nil, trigger_request) project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value") |