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

Merge branch 'hly-fix-broken-master-sidekiq' into 'master'

Fix broken master due to Sidekiq usage

See merge request gitlab-org/gitlab!19022
parents 4fff94c0 c6f1978b
...@@ -321,7 +321,7 @@ describe Epics::UpdateDatesService do ...@@ -321,7 +321,7 @@ describe Epics::UpdateDatesService do
expect(epic.due_date_sourcing_epic).to be_nil expect(epic.due_date_sourcing_epic).to be_nil
end end
context "when epic dates are propagated upwards" do context "when epic dates are propagated upwards", :sidekiq_inline do
let(:top_level_parent_epic) { create(:epic, group: group) } let(:top_level_parent_epic) { create(:epic, group: group) }
let(:parent_epic) { create(:epic, group: group, parent: top_level_parent_epic) } let(:parent_epic) { create(:epic, group: group, parent: top_level_parent_epic) }
......
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