diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-11 09:54:20 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-11 09:54:20 +0100 |
commit | 1d04ae7458bec082a2f82d0776f89e297719f23c (patch) | |
tree | 97d873cf0e6a244a8f1bf7cbc24a06b3b72dc43f /app | |
parent | 6a2e10e38ba87678b6b44fa73786eb1f4a668a4e (diff) | |
download | gitlab-ce-1d04ae7458bec082a2f82d0776f89e297719f23c.tar.gz |
Fixes Web IDE not loading merge request files
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60243
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/ide/stores/mutations/merge_request.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/stores/mutations/merge_request.js b/app/assets/javascripts/ide/stores/mutations/merge_request.js index 334819fe702..e5b5107bc93 100644 --- a/app/assets/javascripts/ide/stores/mutations/merge_request.js +++ b/app/assets/javascripts/ide/stores/mutations/merge_request.js @@ -7,6 +7,8 @@ export default { }); }, [types.SET_MERGE_REQUEST](state, { projectPath, mergeRequestId, mergeRequest }) { + const existingMergeRequest = state.projects[projectPath].mergeRequests[mergeRequestId] || {}; + Object.assign(state.projects[projectPath], { mergeRequests: { [mergeRequestId]: { @@ -15,6 +17,7 @@ export default { changes: [], versions: [], baseCommitSha: null, + ...existingMergeRequest, }, }, }); |