diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/assets/javascripts/issuable_show/components/issuable_show_root.vue | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/assets/javascripts/issuable_show/components/issuable_show_root.vue')
-rw-r--r-- | app/assets/javascripts/issuable_show/components/issuable_show_root.vue | 36 |
1 files changed, 36 insertions, 0 deletions
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 240f35b74c8..b514a6b01d8 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_show_root.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_show_root.vue @@ -2,6 +2,7 @@ import IssuableSidebar from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; import IssuableBody from './issuable_body.vue'; +import IssuableDiscussion from './issuable_discussion.vue'; import IssuableHeader from './issuable_header.vue'; export default { @@ -9,6 +10,7 @@ export default { IssuableSidebar, IssuableHeader, IssuableBody, + IssuableDiscussion, }, props: { issuable: { @@ -40,6 +42,11 @@ export default { required: false, default: true, }, + enableTaskList: { + type: Boolean, + required: false, + default: false, + }, editFormVisible: { type: Boolean, required: false, @@ -60,6 +67,21 @@ export default { required: false, default: '', }, + taskCompletionStatus: { + type: Object, + required: false, + default: null, + }, + taskListUpdatePath: { + type: String, + required: false, + default: '', + }, + taskListLockVersion: { + type: Number, + required: false, + default: 0, + }, }, methods: { handleKeydownTitle(e, issuableMeta) { @@ -81,6 +103,7 @@ export default { :confidential="issuable.confidential" :created-at="issuable.createdAt" :author="issuable.author" + :task-completion-status="taskCompletionStatus" > <template #status-badge> <slot name="status-badge"></slot> @@ -89,6 +112,7 @@ export default { <slot name="header-actions"></slot> </template> </issuable-header> + <issuable-body :issuable="issuable" :status-badge-class="statusBadgeClass" @@ -96,11 +120,16 @@ export default { :enable-edit="enableEdit" :enable-autocomplete="enableAutocomplete" :enable-autosave="enableAutosave" + :enable-task-list="enableTaskList" :edit-form-visible="editFormVisible" :show-field-title="showFieldTitle" :description-preview-path="descriptionPreviewPath" :description-help-path="descriptionHelpPath" + :task-list-update-path="taskListUpdatePath" + :task-list-lock-version="taskListLockVersion" @edit-issuable="$emit('edit-issuable', $event)" + @task-list-update-success="$emit('task-list-update-success', $event)" + @task-list-update-failure="$emit('task-list-update-failure')" @keydown-title="handleKeydownTitle" @keydown-description="handleKeydownDescription" > @@ -111,6 +140,13 @@ export default { <slot name="edit-form-actions" v-bind="actionsProps"></slot> </template> </issuable-body> + + <issuable-discussion> + <template #discussion> + <slot name="discussion"></slot> + </template> + </issuable-discussion> + <issuable-sidebar @sidebar-toggle="$emit('sidebar-toggle', $event)"> <template #right-sidebar-items="sidebarProps"> <slot name="right-sidebar-items" v-bind="sidebarProps"></slot> |