diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-04 21:08:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-04 21:08:46 +0300 |
| commit | b41cd8cb92d53454b2b160ba922d33801933a9cf (patch) | |
| tree | 3519da8856f8bf12ce9e75248e5ecb9ed4eacf14 /app/assets/javascripts/diffs/store/mutations.js | |
| parent | 8d3aee3636da5181ae94d23b47c6794b5610ab01 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs/store/mutations.js')
| -rw-r--r-- | app/assets/javascripts/diffs/store/mutations.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index de2f68d729c..fccfd950d75 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -39,7 +39,16 @@ export default { }, [types.SET_DIFF_DATA](state, data) { - prepareDiffData(data); + if ( + !( + gon && + gon.features && + gon.features.diffsBatchLoad && + window.location.search.indexOf('diff_id') === -1 + ) + ) { + prepareDiffData(data); + } Object.assign(state, { ...convertObjectPropsToCamelCase(data), |