diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 15:07:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 15:07:53 +0000 |
| commit | d7a028e20d29b8c6d0e780ac168544dfbb712d3c (patch) | |
| tree | f9fc9ea12e166aec6c4ffe476ba7a3566396b696 /spec/support/helpers/stub_gitlab_calls.rb | |
| parent | 0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a (diff) | |
| download | gitlab-ce-d7a028e20d29b8c6d0e780ac168544dfbb712d3c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/helpers/stub_gitlab_calls.rb')
| -rw-r--r-- | spec/support/helpers/stub_gitlab_calls.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/spec/support/helpers/stub_gitlab_calls.rb b/spec/support/helpers/stub_gitlab_calls.rb index ff4b9db8ad9..40f4151c0fb 100644 --- a/spec/support/helpers/stub_gitlab_calls.rb +++ b/spec/support/helpers/stub_gitlab_calls.rb @@ -30,11 +30,9 @@ module StubGitlabCalls # Stub the first call to `include:[local: .gitlab-ci.yml]` when # evaluating the CI root config content. - if Feature.enabled?(:ci_root_config_content, default_enabled: true) - allow_any_instance_of(Gitlab::Ci::Config::External::File::Local) - .to receive(:content) - .and_return(ci_yaml_content) - end + allow_any_instance_of(Gitlab::Ci::Config::External::File::Local) + .to receive(:content) + .and_return(ci_yaml_content) end def stub_pipeline_modified_paths(pipeline, modified_paths) |