diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-15 19:29:19 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-15 19:31:29 +0300 |
| commit | 916d7da4a81cfc2225080382eff94a7a7193b080 (patch) | |
| tree | c9e7bb4f5bb390bc3a5ae296da5740f069a38571 /spec | |
| parent | cbeaa57a4afff922a7cacd5a10d1b25c7492a1f8 (diff) | |
Merge branch 'fix-gitlab-ci-yml' into 'master'
Look for .gitlab-ci.yml only if checkout_sha is present
Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2396
cc @vsizov
See merge request !818
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/project_services/gitlab_ci_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_services/gitlab_ci_service_spec.rb b/spec/models/project_services/gitlab_ci_service_spec.rb index ebd8b545aa7..c92cf3cdae6 100644 --- a/spec/models/project_services/gitlab_ci_service_spec.rb +++ b/spec/models/project_services/gitlab_ci_service_spec.rb @@ -58,7 +58,7 @@ describe GitlabCiService do service_hook = double service_hook.should_receive(:execute) @service.should_receive(:service_hook).and_return(service_hook) - @service.should_receive(:ci_yaml_file).with(push_sample_data) + @service.should_receive(:ci_yaml_file).with(push_sample_data[:checkout_sha]) @service.execute(push_sample_data) end |