diff options
Diffstat (limited to 'app/assets/javascripts/issuable_show/components')
6 files changed, 15 insertions, 7 deletions
diff --git a/app/assets/javascripts/issuable_show/components/issuable_body.vue b/app/assets/javascripts/issuable_show/components/issuable_body.vue index c084f328f42..02cf7a67727 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_body.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_body.vue @@ -3,9 +3,9 @@ import { GlLink } from '@gitlab/ui'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import IssuableTitle from './issuable_title.vue'; import IssuableDescription from './issuable_description.vue'; import IssuableEditForm from './issuable_edit_form.vue'; +import IssuableTitle from './issuable_title.vue'; export default { components: { diff --git a/app/assets/javascripts/issuable_show/components/issuable_description.vue b/app/assets/javascripts/issuable_show/components/issuable_description.vue index 091a4be5bd8..aa7e530972f 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_description.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_description.vue @@ -1,6 +1,6 @@ <script> -import $ from 'jquery'; import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; +import $ from 'jquery'; import '~/behaviors/markdown/render_gfm'; export default { diff --git a/app/assets/javascripts/issuable_show/components/issuable_edit_form.vue b/app/assets/javascripts/issuable_show/components/issuable_edit_form.vue index 830a740ff78..6d139541524 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_edit_form.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_edit_form.vue @@ -1,6 +1,6 @@ <script> -import $ from 'jquery'; import { GlForm, GlFormGroup, GlFormInput } from '@gitlab/ui'; +import $ from 'jquery'; import Autosave from '~/autosave'; import MarkdownField from '~/vue_shared/components/markdown/field.vue'; diff --git a/app/assets/javascripts/issuable_show/components/issuable_header.vue b/app/assets/javascripts/issuable_show/components/issuable_header.vue index 5404753631d..de17f7e7f6b 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_header.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_header.vue @@ -2,6 +2,7 @@ import { GlIcon, GlButton, GlTooltipDirective, GlAvatarLink, GlAvatarLabeled } from '@gitlab/ui'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { isExternal } from '~/lib/utils/url_utility'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; export default { @@ -49,6 +50,9 @@ export default { authorId() { return getIdFromGraphQLId(`${this.author.id}`); }, + isAuthorExternal() { + return isExternal(this.author.webUrl); + }, }, mounted() { this.toggleSidebarButtonEl = document.querySelector('.js-toggle-right-sidebar-button'); @@ -98,7 +102,11 @@ export default { :src="author.avatarUrl" :label="author.name" class="d-none d-sm-inline-flex gl-ml-1" - /> + > + <template #meta> + <gl-icon v-if="isAuthorExternal" name="external-link" /> + </template> + </gl-avatar-labeled> <strong class="author d-sm-none d-inline">@{{ author.username }}</strong> </gl-avatar-link> </div> @@ -112,7 +120,7 @@ export default { </div> <div data-testid="header-actions" - class="detail-page-header-actions gl-display-flex gl-display-md-block" + class="detail-page-header-actions gl-display-flex gl-md-display-block" > <slot name="header-actions"></slot> </div> diff --git a/app/assets/javascripts/issuable_show/components/issuable_show_root.vue b/app/assets/javascripts/issuable_show/components/issuable_show_root.vue index 2443338e8c4..240f35b74c8 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_show_root.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_show_root.vue @@ -1,8 +1,8 @@ <script> import IssuableSidebar from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; -import IssuableHeader from './issuable_header.vue'; import IssuableBody from './issuable_body.vue'; +import IssuableHeader from './issuable_header.vue'; export default { components: { diff --git a/app/assets/javascripts/issuable_show/components/issuable_title.vue b/app/assets/javascripts/issuable_show/components/issuable_title.vue index d3b42fd2ffb..b7ea4a010a3 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_title.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_title.vue @@ -54,7 +54,7 @@ export default { <template> <div> <div class="title-container"> - <h2 v-safe-html="issuable.titleHtml" class="title qa-title" dir="auto"></h2> + <h2 v-safe-html="issuable.titleHtml || issuable.title" class="title qa-title" dir="auto"></h2> <gl-button v-if="enableEdit" v-gl-tooltip.bottom |