summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-08-09 08:57:37 +0100
committerPhil Hughes <me@iamphill.com>2018-08-09 08:57:37 +0100
commit670db0aa2dcf0bbd2476a871a4a8ea9f4beb1817 (patch)
tree8bd5fed5403ede7cf01f10408c33395a907067b8 /app/assets/javascripts/ide
parent7c07a2b6f2913a3ef868d7b59a97343a51904215 (diff)
downloadgitlab-ce-670db0aa2dcf0bbd2476a871a4a8ea9f4beb1817.tar.gz
Allow the Web IDE to open empty merge requests
Closes #48166
Diffstat (limited to 'app/assets/javascripts/ide')
-rw-r--r--app/assets/javascripts/ide/ide_router.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/ide_router.js b/app/assets/javascripts/ide/ide_router.js
index c6d7d218e81..82f6f981e7a 100644
--- a/app/assets/javascripts/ide/ide_router.js
+++ b/app/assets/javascripts/ide/ide_router.js
@@ -117,7 +117,7 @@ router.beforeEach((to, from, next) => {
mergeRequestId: to.params.mrid,
})
.then(mr => {
- store.dispatch('updateActivityBarView', activityBarViews.review);
+ store.dispatch('setCurrentBranchId', mr.source_branch);
store.dispatch('getBranchData', {
projectId: fullProjectId,
@@ -144,6 +144,10 @@ router.beforeEach((to, from, next) => {
}),
)
.then(mrChanges => {
+ if (mrChanges.changes.length) {
+ store.dispatch('updateActivityBarView', activityBarViews.review);
+ }
+
mrChanges.changes.forEach((change, ind) => {
const changeTreeEntry = store.state.entries[change.new_path];