diff options
| author | Simon Knox <psimyn@gmail.com> | 2019-06-11 14:15:08 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2019-06-14 23:57:05 +1000 |
| commit | 14f27102b696672f02b5d1b2ab45688b711f4024 (patch) | |
| tree | eef48bb1366b20a961e6aa4bb61bc357dc77d1c9 /app/assets/javascripts/issue_show/components/app.vue | |
| parent | 577832598f1b35187efafc426068ef7ac36ae09f (diff) | |
| download | gitlab-ce-14f27102b696672f02b5d1b2ab45688b711f4024.tar.gz | |
Add Join meeting button to Issues with Zoom links62966-embed-zoom-call-in-issue-mvc
Detect links containing zoom.us followed by j, s, or my
Add link below Issue title that links to Zoom meeting
Diffstat (limited to 'app/assets/javascripts/issue_show/components/app.vue')
| -rw-r--r-- | app/assets/javascripts/issue_show/components/app.vue | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index e88ca4747c5..de2a9664cde 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -11,6 +11,7 @@ import titleComponent from './title.vue'; import descriptionComponent from './description.vue'; import editedComponent from './edited.vue'; import formComponent from './form.vue'; +import PinnedLinks from './pinned_links.vue'; import recaptchaModalImplementor from '../../vue_shared/mixins/recaptcha_modal_implementor'; export default { @@ -19,6 +20,7 @@ export default { titleComponent, editedComponent, formComponent, + PinnedLinks, }, mixins: [recaptchaModalImplementor], props: { @@ -340,6 +342,7 @@ export default { :title-text="state.titleText" :show-inline-edit-button="showInlineEditButton" /> + <pinned-links :description-html="state.descriptionHtml" /> <description-component v-if="state.descriptionHtml" :can-update="canUpdate" |