diff options
| author | Alex Groleau <agroleau@gitlab.com> | 2019-08-27 12:41:39 -0400 |
|---|---|---|
| committer | Alex Groleau <agroleau@gitlab.com> | 2019-08-27 12:41:39 -0400 |
| commit | aa01f092829facd1044ad02f334422b7dbdc8b0e (patch) | |
| tree | a754bf2497820432df7da0f2108bb7527a8dd7b8 /app/assets/javascripts/issue_show/components/app.vue | |
| parent | a1d9c9994a9a4d79b824c3fd9322688303ac8b03 (diff) | |
| parent | 6b10779053ff4233c7a64c5ab57754fce63f6710 (diff) | |
| download | gitlab-ce-runner-metrics-extractor.tar.gz | |
Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor
Diffstat (limited to 'app/assets/javascripts/issue_show/components/app.vue')
| -rw-r--r-- | app/assets/javascripts/issue_show/components/app.vue | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index de2a9664cde..9ca38d6bbfa 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -55,6 +55,11 @@ export default { required: false, default: true, }, + zoomMeetingUrl: { + type: String, + required: false, + default: null, + }, issuableRef: { type: String, required: true, @@ -342,7 +347,7 @@ export default { :title-text="state.titleText" :show-inline-edit-button="showInlineEditButton" /> - <pinned-links :description-html="state.descriptionHtml" /> + <pinned-links :zoom-meeting-url="zoomMeetingUrl" /> <description-component v-if="state.descriptionHtml" :can-update="canUpdate" |