Fix conflicts in merging 11.0.0-rc2 CE preparation branch
There are 3 conflicts in this MR:
-
app/views/search/results/_blob_data.html.haml@fjsanpedro -
spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb@dosuken123 -
app/models/ci/pipeline.rb@dosuken123
I pinged the developers who should be the authors of such changes.
@dosuken123 looks like gitlab-org/gitlab-ce!18558 was merged before gitlab-org/gitlab-ee!5745 was ready.
Edited by Kamil Trzciński