Skip to content

Backport of CE->EE merge conflict resolution

Lukas Eipert requested to merge leipert-backport-bs4-merge-conflict into master

What does this MR do?

Backport the EE version of app/assets/javascripts/jobs/components/sidebar_details_block.vue

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

While I solved a conflict in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5860, the EE and CE version of app/assets/javascripts/jobs/components/sidebar_details_block.vue diverged.

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Edited by Lukas Eipert

Merge request reports