Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-15 21:09:34 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-15 21:09:34 +0300
commita84aefe0bb8fc2ad47ab67cb4ddcfbb7aecfbd5e (patch)
treedfcd00dc9603a8c652211c6066ceae0c97df1a7f /app/assets/javascripts/work_items
parent16cdacff02fbf0069182e090df2eeaa754007957 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/work_items')
-rw-r--r--app/assets/javascripts/work_items/components/work_item_links/okr_actions_split_button.vue8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/javascripts/work_items/components/work_item_links/okr_actions_split_button.vue b/app/assets/javascripts/work_items/components/work_item_links/okr_actions_split_button.vue
index cbe67aa622c..dc5bcdc3dcc 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/okr_actions_split_button.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/okr_actions_split_button.vue
@@ -1,5 +1,5 @@
<script>
-import { GlDropdown, GlDropdownSectionHeader, GlDropdownItem } from '@gitlab/ui';
+import { GlDropdown, GlDropdownSectionHeader, GlDropdownItem, GlDropdownDivider } from '@gitlab/ui';
import { s__ } from '~/locale';
@@ -32,6 +32,7 @@ export default {
GlDropdown,
GlDropdownSectionHeader,
GlDropdownItem,
+ GlDropdownDivider,
},
methods: {
change({ eventName }) {
@@ -52,10 +53,6 @@ export default {
{{ item.title }}
</gl-dropdown-item>
- <!-- TODO: Uncomment once following two issues addressed -->
- <!-- https://gitlab.com/gitlab-org/gitlab/-/issues/381833 -->
- <!-- https://gitlab.com/gitlab-org/gitlab/-/issues/385084 -->
- <!--
<gl-dropdown-divider />
<gl-dropdown-section-header>{{ __('Key result') }}</gl-dropdown-section-header>
<gl-dropdown-item
@@ -65,6 +62,5 @@ export default {
>
{{ item.title }}
</gl-dropdown-item>
- -->
</gl-dropdown>
</template>