diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/issue_show/components/pinned_links.vue | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/issue_show/components/pinned_links.vue')
-rw-r--r-- | app/assets/javascripts/issue_show/components/pinned_links.vue | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/app/assets/javascripts/issue_show/components/pinned_links.vue b/app/assets/javascripts/issue_show/components/pinned_links.vue index 965e8a3d751..4b50acceb62 100644 --- a/app/assets/javascripts/issue_show/components/pinned_links.vue +++ b/app/assets/javascripts/issue_show/components/pinned_links.vue @@ -11,21 +11,40 @@ export default { zoomMeetingUrl: { type: String, required: false, - default: null, + default: '', + }, + publishedIncidentUrl: { + type: String, + required: false, + default: '', }, }, }; </script> <template> - <div v-if="zoomMeetingUrl" class="border-bottom mb-3 mt-n2"> - <gl-link - :href="zoomMeetingUrl" - target="_blank" - class="btn btn-inverted btn-secondary btn-sm text-dark mb-3" - > - <icon name="brand-zoom" :size="14" /> - <strong class="vertical-align-top">{{ __('Join Zoom meeting') }}</strong> - </gl-link> + <div class="border-bottom gl-mb-6 gl-display-flex gl-justify-content-start"> + <div v-if="publishedIncidentUrl" class="gl-pr-3"> + <gl-link + :href="publishedIncidentUrl" + target="_blank" + class="btn btn-inverted btn-secondary btn-sm text-dark mb-3" + data-testid="publishedIncidentUrl" + > + <icon name="tanuki" :size="14" /> + <strong class="vertical-align-top">{{ __('Published on status page') }}</strong> + </gl-link> + </div> + <div v-if="zoomMeetingUrl"> + <gl-link + :href="zoomMeetingUrl" + target="_blank" + class="btn btn-inverted btn-secondary btn-sm text-dark mb-3" + data-testid="zoomMeetingUrl" + > + <icon name="brand-zoom" :size="14" /> + <strong class="vertical-align-top">{{ __('Join Zoom meeting') }}</strong> + </gl-link> + </div> </div> </template> |