diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-11 10:17:39 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-11 10:17:39 +0000 |
commit | 423f82d41125ef2a6bfafb0d963dafd52ba656db (patch) | |
tree | 2d14c9153f1b06d16f37c427c511f2906ed8c1ef /app | |
parent | 51119395e668d592d69266cf74dcb67b667082a8 (diff) | |
parent | 1d04ae7458bec082a2f82d0776f89e297719f23c (diff) | |
download | gitlab-ce-423f82d41125ef2a6bfafb0d963dafd52ba656db.tar.gz |
Merge branch 'fixed-web-ide-merge-request-review' into 'master'
Fixes Web IDE not loading merge request files
Closes #60243
See merge request gitlab-org/gitlab-ce!27225
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, }, }, }); |