Commit d8d24efe authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '218684-follow-up-use-gon-relative_url_root-instead-of-root_path-in-time_tracking' into 'master'

Use gon.relative_url_root instead of root_path

See merge request gitlab-org/gitlab!45394
parents 2b1b1f34 9d60b80a
...@@ -56,6 +56,9 @@ export default { ...@@ -56,6 +56,9 @@ export default {
// Note: Realtime is only available on issues right now, future support for MR wil be built later. // Note: Realtime is only available on issues right now, future support for MR wil be built later.
return this.glFeatures.realTimeIssueSidebar && this.issuableType === 'issue'; return this.glFeatures.realTimeIssueSidebar && this.issuableType === 'issue';
}, },
relativeUrlRoot() {
return gon.relative_url_root ?? '';
},
}, },
created() { created() {
this.removeAssignee = this.store.removeAssignee.bind(this.store); this.removeAssignee = this.store.removeAssignee.bind(this.store);
...@@ -119,7 +122,7 @@ export default { ...@@ -119,7 +122,7 @@ export default {
/> />
<assignees <assignees
v-if="!store.isFetching.assignees" v-if="!store.isFetching.assignees"
:root-path="store.rootPath" :root-path="relativeUrlRoot"
:users="store.assignees" :users="store.assignees"
:editable="store.editable" :editable="store.editable"
:issuable-type="issuableType" :issuable-type="issuableType"
......
...@@ -50,6 +50,11 @@ export default { ...@@ -50,6 +50,11 @@ export default {
loading: false, loading: false,
}; };
}, },
computed: {
relativeUrlRoot() {
return gon.relative_url_root ?? '';
},
},
created() { created() {
this.removeReviewer = this.store.removeReviewer.bind(this.store); this.removeReviewer = this.store.removeReviewer.bind(this.store);
this.addReviewer = this.store.addReviewer.bind(this.store); this.addReviewer = this.store.addReviewer.bind(this.store);
...@@ -97,7 +102,7 @@ export default { ...@@ -97,7 +102,7 @@ export default {
/> />
<reviewers <reviewers
v-if="!store.isFetching.reviewers" v-if="!store.isFetching.reviewers"
:root-path="store.rootPath" :root-path="relativeUrlRoot"
:users="store.reviewers" :users="store.reviewers"
:editable="store.editable" :editable="store.editable"
:issuable-type="issuableType" :issuable-type="issuableType"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment