diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-13 15:11:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-13 15:11:29 +0300 |
| commit | 3c293d24c3408d204be7d84d6319b373c83ff6ae (patch) | |
| tree | bb64f9751f7d859b43b7a0f58c184c503135373b /app/assets/javascripts/vue_shared | |
| parent | 2ea5c7c9c919b801d5039722e271ba077cc05986 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/incidents/utils.js | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/incidents/utils.js b/app/assets/javascripts/vue_shared/components/incidents/utils.js deleted file mode 100644 index bcb578a6ba6..00000000000 --- a/app/assets/javascripts/vue_shared/components/incidents/utils.js +++ /dev/null @@ -1,3 +0,0 @@ -import { noop } from 'lodash'; - -export const isValidSlaDueAt = noop; diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue index 947a42d4184..690d9523a63 100644 --- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue +++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue @@ -372,7 +372,7 @@ export default { </div> <div class="issuable-meta"> <ul v-if="showIssuableMeta" class="controls"> - <li v-if="hasSlotContents('status')" class="issuable-status"> + <li v-if="hasSlotContents('status')"> <slot name="status"></slot> </li> <li v-if="assignees.length"> |