Commit d61b1c31 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch...

Merge branch '14674-broken-master-ee-spec-features-projects-environments_pod_logs_spec-rb-51' into 'master'

Resolve "Broken master: ee/spec/features/projects/environments_pod_logs_spec.rb:51"

Closes #14674

See merge request gitlab-org/gitlab-ee!15992
parents 5269f323 31beb086
......@@ -45,7 +45,7 @@ describe 'Environment > Pod Logs', :js do
context 'with perf bar enabled' do
before do
allow_any_instance_of(WithPerformanceBar).to receive(:peek_enabled?).and_return(true)
allow(Gitlab::PerformanceBar).to receive(:enabled_for_request?).and_return(true)
end
it 'log header sticks to top' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment