diff options
author | Phil Hughes <me@iamphill.com> | 2018-06-04 12:11:00 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-06-06 11:19:27 +0100 |
commit | ce2bc5c0a8021e876308b4990bc17f95aad90387 (patch) | |
tree | c7a63044cac9746c5c6564dc593ccb52df32e862 /app/assets/javascripts/ide/components/ide_review.vue | |
parent | 03820e9b03fb25c94263231aaee30fec0b6468f4 (diff) | |
download | gitlab-ce-ce2bc5c0a8021e876308b4990bc17f95aad90387.tar.gz |
correctly load up merge request
fixed pipeline request throwing an error
Diffstat (limited to 'app/assets/javascripts/ide/components/ide_review.vue')
-rw-r--r-- | app/assets/javascripts/ide/components/ide_review.vue | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/ide/components/ide_review.vue b/app/assets/javascripts/ide/components/ide_review.vue index 0c9ec3b00f0..ec2af50283a 100644 --- a/app/assets/javascripts/ide/components/ide_review.vue +++ b/app/assets/javascripts/ide/components/ide_review.vue @@ -11,17 +11,17 @@ export default { }, computed: { ...mapGetters(['currentMergeRequest']), - ...mapState(['viewer']), + ...mapState(['viewer', 'currentMergeRequestId']), showLatestChangesText() { - return !this.currentMergeRequest || this.viewer === viewerTypes.diff; + return !this.currentMergeRequestId || this.viewer === viewerTypes.diff; }, showMergeRequestText() { - return this.currentMergeRequest && this.viewer === viewerTypes.mr; + return this.currentMergeRequestId && this.viewer === viewerTypes.mr; }, }, mounted() { this.$nextTick(() => { - this.updateViewer(this.currentMergeRequest ? viewerTypes.mr : viewerTypes.diff); + this.updateViewer(this.currentMergeRequestId ? viewerTypes.mr : viewerTypes.diff); }); }, methods: { @@ -54,7 +54,10 @@ export default { </template> <template v-else-if="showMergeRequestText"> {{ __('Merge request') }} - (<a :href="currentMergeRequest.web_url">!{{ currentMergeRequest.iid }}</a>) + (<a + v-if="currentMergeRequest" + :href="currentMergeRequest.web_url" + >!{{ currentMergeRequest.iid }}</a>) </template> </div> </template> |