From e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 Apr 2020 01:43:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@12-10-stable-ee --- app/assets/javascripts/diffs/store/getters_versions_dropdowns.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/assets/javascripts/diffs') diff --git a/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js b/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js index dd682060b4b..acc8874dad8 100644 --- a/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js +++ b/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js @@ -39,7 +39,11 @@ export const diffCompareDropdownTargetVersions = (state, getters) => { ...v, }; }; - return [...state.mergeRequestDiffs.slice(1).map(formatVersion), baseVersion, headVersion]; + + if (gon.features?.diffCompareWithHead) { + return [...state.mergeRequestDiffs.slice(1).map(formatVersion), baseVersion, headVersion]; + } + return [...state.mergeRequestDiffs.slice(1).map(formatVersion), baseVersion]; }; export const diffCompareDropdownSourceVersions = (state, getters) => { -- cgit v1.2.3