diff options
| author | Phil Hughes <me@iamphill.com> | 2018-08-09 08:57:37 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-08-09 08:57:37 +0100 |
| commit | 670db0aa2dcf0bbd2476a871a4a8ea9f4beb1817 (patch) | |
| tree | 8bd5fed5403ede7cf01f10408c33395a907067b8 | |
| parent | 7c07a2b6f2913a3ef868d7b59a97343a51904215 (diff) | |
| download | gitlab-ce-670db0aa2dcf0bbd2476a871a4a8ea9f4beb1817.tar.gz | |
Allow the Web IDE to open empty merge requests
Closes #48166
| -rw-r--r-- | app/assets/javascripts/ide/ide_router.js | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/ide-open-empty-merge-request.yml | 5 |
2 files changed, 10 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]; diff --git a/changelogs/unreleased/ide-open-empty-merge-request.yml b/changelogs/unreleased/ide-open-empty-merge-request.yml new file mode 100644 index 00000000000..09cf231c25c --- /dev/null +++ b/changelogs/unreleased/ide-open-empty-merge-request.yml @@ -0,0 +1,5 @@ +--- +title: Fix empty merge requests not opening in the Web IDE +merge_request: +author: +type: fixed |