diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-07 14:42:34 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-07 14:42:34 +0300 |
| commit | bf4073d53a988d7f31f2e099236041ed9f4f3b88 (patch) | |
| tree | c195b8e5b389ad1ba74d1756c6336eb946caceda /spec/controllers | |
| parent | 892b371dadeec0baf28bf401d2ef26906957d81c (diff) | |
| parent | e1d11cc64970d712352de0c5daadced7f274ea3d (diff) | |
Merge branch 'live-trace-v2' into 'master'
New CI Job live-trace architecture (v2)
Closes #44935
See merge request gitlab-org/gitlab-ce!18169
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/jobs_controller_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index b9a979044fe..2281cb420d9 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -1,7 +1,7 @@ # coding: utf-8 require 'spec_helper' -describe Projects::JobsController do +describe Projects::JobsController, :clean_gitlab_redis_shared_state do include ApiHelpers include HttpIOHelpers @@ -10,6 +10,7 @@ describe Projects::JobsController do let(:user) { create(:user) } before do + stub_feature_flags(ci_enable_live_trace: true) stub_not_protect_default_branch end |