diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-12 06:17:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-12 06:17:21 +0000 |
| commit | 43d816ebc20da6ff959176248c70d8c4c7c9345a (patch) | |
| tree | 7d2fc13596ffb57f127b60486e5ed43a7993d389 /app | |
| parent | 0466f3a162f33e45866a5f4d76545b3f1cd4ab18 (diff) | |
| download | gitlab-ce-43d816ebc20da6ff959176248c70d8c4c7c9345a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/work_items/components/work_item_actions.vue | 9 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/animations.scss | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue index d52726af02e..8ea5873f73a 100644 --- a/app/assets/javascripts/work_items/components/work_item_actions.vue +++ b/app/assets/javascripts/work_items/components/work_item_actions.vue @@ -13,7 +13,6 @@ import { s__ } from '~/locale'; import Tracking from '~/tracking'; import toast from '~/vue_shared/plugins/global_toast'; import { isLoggedIn } from '~/lib/utils/common_utils'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { sprintfWorkItem, I18N_WORK_ITEM_DELETE, @@ -51,7 +50,7 @@ export default { directives: { GlModal: GlModalDirective, }, - mixins: [Tracking.mixin({ label: 'actions_menu' }), glFeatureFlagsMixin()], + mixins: [Tracking.mixin({ label: 'actions_menu' })], isLoggedIn: isLoggedIn(), notificationsToggleTestId: TEST_ID_NOTIFICATIONS_TOGGLE_ACTION, notificationsToggleFormTestId: TEST_ID_NOTIFICATIONS_TOGGLE_FORM, @@ -126,11 +125,7 @@ export default { }; }, canPromoteToObjective() { - return ( - this.glFeatures.workItemsMvc2 && - this.canUpdate && - this.workItemType === WORK_ITEM_TYPE_VALUE_KEY_RESULT - ); + return this.canUpdate && this.workItemType === WORK_ITEM_TYPE_VALUE_KEY_RESULT; }, objectiveWorkItemTypeId() { return this.workItemTypes.find((type) => type.name === WORK_ITEM_TYPE_VALUE_OBJECTIVE).id; diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss index fa235f72e35..c93ef2287a8 100644 --- a/app/assets/stylesheets/framework/animations.scss +++ b/app/assets/stylesheets/framework/animations.scss @@ -102,7 +102,6 @@ @include transition(color); } -a, .notification-dot { @include transition(background-color, color, border); } |