diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 09:08:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 09:08:01 +0000 |
| commit | 17b91a3c6ab73fff087e91665e9afb8046cbf045 (patch) | |
| tree | 04655a8630478d9846571875f69469f018d4bdcc /spec/controllers/projects/jobs_controller_spec.rb | |
| parent | b3db40398ce9ad335270617e834fde96d46f90ea (diff) | |
| download | gitlab-ce-17b91a3c6ab73fff087e91665e9afb8046cbf045.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/jobs_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/jobs_controller_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index ac13c0f2d9e..3e0a894e72e 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -11,7 +11,6 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do before do stub_feature_flags(ci_enable_live_trace: true) - stub_feature_flags(job_log_json: false) stub_not_protect_default_branch end @@ -527,7 +526,6 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do describe 'GET trace.json' do before do - stub_feature_flags(job_log_json: true) get_trace end @@ -634,6 +632,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do describe 'GET legacy trace.json' do before do + stub_feature_flags(job_log_json: false) get_trace end |