diff options
| author | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-14 11:24:45 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-14 12:25:37 +0100 |
| commit | 32d83ee79fedc8760486ff40a2459ecb472fa51b (patch) | |
| tree | 46b8032b6bcbfd1482707a9080e6538bf44faa1c /spec/support | |
| parent | b8f67c5e4735eb25a3d03daeb95900dc87692123 (diff) | |
| parent | c81023435795766411c5954a4676ebb215af40a6 (diff) | |
| download | gitlab-ce-32d83ee79fedc8760486ff40a2459ecb472fa51b.tar.gz | |
Merge branch 'master' into ux/suppress-ci-yml-warning
* master: (24 commits)
Fix runners admin view
Fix migrations
Run builds from projects with enabled CI
Use Gitlab::Git instead of Ci::Git
Fix last specs
Fix specs
Fix after column rename
Fix errors
Update badge
Finishing touches
Fix triggers tests
Rename columns and rename migrations
Reimplement Trigger API
Remove ci_ prefix from all ci related things
Add runners token
Migrate CI::Project to Project
Fix indentation and BuildsEmailService
Change default values
Enhance migrate CI emails
Fix issue tracker service
...
Conflicts:
spec/features/commits_spec.rb
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/stub_gitlab_calls.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb index 90936183824..eec2e681117 100644 --- a/spec/support/stub_gitlab_calls.rb +++ b/spec/support/stub_gitlab_calls.rb @@ -21,8 +21,8 @@ module StubGitlabCalls allow_any_instance_of(Ci::Commit).to receive(:ci_yaml_file) { ci_yaml } end - def stub_ci_service_disabled - allow_any_instance_of(GitlabCiService).to receive(:active).and_return(false) + def stub_ci_builds_disabled + allow_any_instance_of(Project).to receive(:builds_enabled?).and_return(false) end private |