diff --git a/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_note.vue b/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_note.vue index 4423eb9e7b259a9036aae0d273c1136e89d1ca6a..61d1baf75b16b2aefd793841eb8cbfda39a0e5b5 100644 --- a/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_note.vue +++ b/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_note.vue @@ -103,6 +103,7 @@ export default { :created-at="note.createdAt" :note-id="note.id" :note-url="note.url" + :imported="note.imported" > · diff --git a/app/assets/javascripts/design_management/components/design_destroyer.vue b/app/assets/javascripts/design_management/components/design_destroyer.vue index 0178111f651b2bad16a98867bf7bec1d923bfb76..e1824b725465c177800dd3c2c1904807e96fc7fc 100644 --- a/app/assets/javascripts/design_management/components/design_destroyer.vue +++ b/app/assets/javascripts/design_management/components/design_destroyer.vue @@ -22,6 +22,11 @@ export default { type: Array, required: true, }, + imported: { + type: Boolean, + required: false, + default: false, + } }, computed: { projectQueryBody() { diff --git a/app/assets/javascripts/design_management/components/design_notes/design_note.vue b/app/assets/javascripts/design_management/components/design_notes/design_note.vue index 38081c99e72af05ab0206a0015f7c0b91443d6e1..2faa968b8bfa0aa09c37c289b6ea4af56406dfaa 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_note.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_note.vue @@ -299,6 +299,7 @@ export default { > + imported
diff --git a/app/assets/javascripts/design_management/components/toolbar/index.vue b/app/assets/javascripts/design_management/components/toolbar/index.vue index 45c04b80a2da39dd2cacfefb5fc405b715ea1dac..0972aa827d20eaafe4937bc4e20e0e273805aaf7 100644 --- a/app/assets/javascripts/design_management/components/toolbar/index.vue +++ b/app/assets/javascripts/design_management/components/toolbar/index.vue @@ -71,6 +71,11 @@ export default { required: false, default: '', }, + imported: { + type: Boolean, + required: false, + default: false, + }, isLoading: { type: Boolean, required: true, @@ -142,6 +147,7 @@ export default { {{ filename }} + imported {{ updatedText }}
diff --git a/app/assets/javascripts/design_management/graphql/fragments/design.fragment.graphql b/app/assets/javascripts/design_management/graphql/fragments/design.fragment.graphql index 4b1703e41c34cf0b64912a6cdde324e2f4df861d..47ea165470f3d2568141265179a8a27c918e75ac 100644 --- a/app/assets/javascripts/design_management/graphql/fragments/design.fragment.graphql +++ b/app/assets/javascripts/design_management/graphql/fragments/design.fragment.graphql @@ -6,6 +6,7 @@ fragment DesignItem on Design { ...DesignListItem fullPath + imported diffRefs { ...DesignDiffRefs } diff --git a/app/assets/javascripts/design_management/graphql/fragments/design_note.fragment.graphql b/app/assets/javascripts/design_management/graphql/fragments/design_note.fragment.graphql index 9af4733d5dc06db36c8d48bf6fe53d3e00979748..de1ce702f21c31259926a3a843fe4769effa55be 100644 --- a/app/assets/javascripts/design_management/graphql/fragments/design_note.fragment.graphql +++ b/app/assets/javascripts/design_management/graphql/fragments/design_note.fragment.graphql @@ -11,6 +11,7 @@ fragment DesignNote on Note { bodyHtml createdAt resolved + imported awardEmoji { nodes { name diff --git a/app/assets/javascripts/design_management/pages/design/index.vue b/app/assets/javascripts/design_management/pages/design/index.vue index 0caed73a44ab9b7603349ffc76380a7c207946b9..81f01e9a16d622c61caaa70513aaedd2511a4b69 100644 --- a/app/assets/javascripts/design_management/pages/design/index.vue +++ b/app/assets/javascripts/design_management/pages/design/index.vue @@ -344,6 +344,7 @@ export default { design.filename, ] /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */" :project-path="projectPath" + :impoted="design.imported" :iid="issueIid" @done="$router.push({ name: $options.DESIGNS_ROUTE_NAME })" @error="onDesignDeleteError" diff --git a/app/assets/javascripts/issues/show/components/app.vue b/app/assets/javascripts/issues/show/components/app.vue index 27646df506b94bfc1d22c2726e72403e1e35877c..a0e8be3cd145d423c77ecbf940a0c35b9902ab91 100644 --- a/app/assets/javascripts/issues/show/components/app.vue +++ b/app/assets/javascripts/issues/show/components/app.vue @@ -221,6 +221,11 @@ export default { required: false, default: '', }, + imported: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -556,6 +561,7 @@ export default { :issuable-type="issuableType" :show="isStickyHeaderShowing" :title="state.titleText" + :imported="imported" @hide="hideStickyHeader" @show="showStickyHeader" /> @@ -576,6 +582,7 @@ export default { :moved-to-issue-url="movedToIssueUrl" :promoted-to-epic-url="promotedToEpicUrl" :service-desk-reply-to="serviceDeskReplyTo" + :imported="imported" /> diff --git a/app/assets/javascripts/issues/show/components/issue_header.vue b/app/assets/javascripts/issues/show/components/issue_header.vue index 96eb8fbb3c7240329106af5b48ff869b3c512b83..522d214b40828798b65e2d8eeae439cacdb15302 100644 --- a/app/assets/javascripts/issues/show/components/issue_header.vue +++ b/app/assets/javascripts/issues/show/components/issue_header.vue @@ -61,6 +61,11 @@ export default { required: false, default: '', }, + imported: { + type: Boolean, + required: false, + default: false, + }, }, computed: { closedStatusLink() { @@ -111,6 +116,7 @@ export default { show-work-item-type-icon :status-icon="statusIcon" :workspace-type="$options.WORKSPACE_PROJECT" + :imported="imported" > + imported