Skip to content
代码片段 群组 项目
未验证 提交 f34cba1e 编辑于 作者: Coung Ngo's avatar Coung Ngo 提交者: GitLab
浏览文件

Merge branch 'nl-issue-actions' into 'master'

Fixes issue actions presentation at small size

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144073



Merged-by: default avatarCoung Ngo <cngo@gitlab.com>
Approved-by: default avatarChad Lavimoniere <clavimoniere@gitlab.com>
Approved-by: default avatarCoung Ngo <cngo@gitlab.com>
Co-authored-by: default avatarNick Leonard <nleonard@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -325,7 +325,7 @@ export default { ...@@ -325,7 +325,7 @@ export default {
:auto-close="false" :auto-close="false"
data-testid="mobile-dropdown" data-testid="mobile-dropdown"
:loading="isToggleStateButtonLoading" :loading="isToggleStateButtonLoading"
placement="right" placement="left"
> >
<template v-if="showMovedSidebarOptions && !glFeatures.notificationsTodosButtons"> <template v-if="showMovedSidebarOptions && !glFeatures.notificationsTodosButtons">
<sidebar-subscriptions-widget <sidebar-subscriptions-widget
...@@ -338,10 +338,6 @@ export default { ...@@ -338,10 +338,6 @@ export default {
<gl-dropdown-divider /> <gl-dropdown-divider />
</template> </template>
<template v-if="showLockIssueOption">
<issuable-lock-form :is-editable="false" data-testid="lock-issue-toggle" />
</template>
<gl-disclosure-dropdown-item v-if="canUpdateIssue" @action="edit"> <gl-disclosure-dropdown-item v-if="canUpdateIssue" @action="edit">
<template #list-item>{{ $options.i18n.edit }}</template> <template #list-item>{{ $options.i18n.edit }}</template>
</gl-disclosure-dropdown-item> </gl-disclosure-dropdown-item>
...@@ -356,6 +352,9 @@ export default { ...@@ -356,6 +352,9 @@ export default {
<gl-disclosure-dropdown-item v-if="canPromoteToEpic" @action="promoteToEpic"> <gl-disclosure-dropdown-item v-if="canPromoteToEpic" @action="promoteToEpic">
<template #list-item>{{ __('Promote to epic') }}</template> <template #list-item>{{ __('Promote to epic') }}</template>
</gl-disclosure-dropdown-item> </gl-disclosure-dropdown-item>
<template v-if="showLockIssueOption">
<issuable-lock-form :is-editable="false" data-testid="lock-issue-toggle" />
</template>
<gl-disclosure-dropdown-item <gl-disclosure-dropdown-item
:data-clipboard-text="issuableReference" :data-clipboard-text="issuableReference"
class="js-copy-reference" class="js-copy-reference"
...@@ -370,7 +369,7 @@ export default { ...@@ -370,7 +369,7 @@ export default {
:data-clipboard-text="issuableEmailAddress" :data-clipboard-text="issuableEmailAddress"
data-testid="copy-email" data-testid="copy-email"
@action="copyEmailAddress" @action="copyEmailAddress"
>{{ copyMailAddressText }}</gl-disclosure-dropdown-item ><template #list-item>{{ copyMailAddressText }}</template></gl-disclosure-dropdown-item
> >
<gl-disclosure-dropdown-item <gl-disclosure-dropdown-item
v-if="canReportSpam" v-if="canReportSpam"
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册