summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2015-12-14 17:16:29 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2015-12-14 17:16:29 +0000
commit4526515704855278b2971522ed013ff007c0e40a (patch)
tree5ad7ce08ffb5e22d4459cf0ec0df53c1a635caff /spec/support
parent3fb89a36cb2c8bead62f4985ebdda1e05f8114df (diff)
parent0a81a681585bf699a7a41a449a2c0c21e2e335c6 (diff)
downloadgitlab-ce-4526515704855278b2971522ed013ff007c0e40a.tar.gz
Merge branch 'ux/suppress-ci-yml-warning' into 'master'
Suppress warning about missing `.gitlab-ci.yml` if builds are disabled When user disables GitLab Ci Service in project's settings then warning about missing `.gitlab-ci.yml` file should be supressed. This a matter of user experience as stated in #3761 (closes #3761). cc @ayufan See merge request !2014
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/stub_gitlab_calls.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb
index 5b3eb1bfc5f..eec2e681117 100644
--- a/spec/support/stub_gitlab_calls.rb
+++ b/spec/support/stub_gitlab_calls.rb
@@ -21,6 +21,10 @@ module StubGitlabCalls
allow_any_instance_of(Ci::Commit).to receive(:ci_yaml_file) { ci_yaml }
end
+ def stub_ci_builds_disabled
+ allow_any_instance_of(Project).to receive(:builds_enabled?).and_return(false)
+ end
+
private
def gitlab_url