diff options
author | Phil Hughes <me@iamphill.com> | 2018-06-04 14:11:00 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-06-06 13:19:27 +0300 |
commit | ce2bc5c0a8021e876308b4990bc17f95aad90387 (patch) | |
tree | c7a63044cac9746c5c6564dc593ccb52df32e862 /app/assets/javascripts/ide/components/merge_requests/item.vue | |
parent | 03820e9b03fb25c94263231aaee30fec0b6468f4 (diff) |
correctly load up merge request
fixed pipeline request throwing an error
Diffstat (limited to 'app/assets/javascripts/ide/components/merge_requests/item.vue')
-rw-r--r-- | app/assets/javascripts/ide/components/merge_requests/item.vue | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/merge_requests/item.vue b/app/assets/javascripts/ide/components/merge_requests/item.vue index 11eb5c8b31b..677ceab8075 100644 --- a/app/assets/javascripts/ide/components/merge_requests/item.vue +++ b/app/assets/javascripts/ide/components/merge_requests/item.vue @@ -14,10 +14,17 @@ export default { type: String, required: true, }, + currentProjectId: { + type: String, + required: true, + }, }, computed: { isActive() { - return this.item.iid === parseInt(this.currentId, 10); + return ( + this.item.iid === parseInt(this.currentId, 10) && + this.currentProjectId === this.item.projectPathWithNamespace + ); }, pathWithID() { return `${this.item.projectPathWithNamespace}!${this.item.iid}`; @@ -35,7 +42,7 @@ export default { <button type="button" class="d-flex align-items-center" - @click="clickItem" + @click.prevent.stop="clickItem" > <span class="d-flex append-right-default" |