diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 25620852caca1f17df39461a107b889483909951..7f21d9418dafdda1906d1ea38cdfc9af412045a0 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -38,6 +38,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo push_frontend_feature_flag(:batch_suggestions, @project, default_enabled: true) push_frontend_feature_flag(:auto_expand_collapsed_diffs, @project, default_enabled: true) push_frontend_feature_flag(:hide_jump_to_next_unresolved_in_threads, @project) + push_frontend_feature_flag(:approvals_commented_by, @project, default_enabled: true) end before_action do diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue index 5ecb5be90ff2f47d2995ec2752c4566074fd216f..8f060c24aa2049b4f9aad80d2b0577abdd97e994 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue +++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue @@ -6,6 +6,7 @@ import { RULE_TYPE_CODE_OWNER, RULE_TYPE_ANY_APPROVER } from 'ee/approvals/const import { sprintf, __, s__ } from '~/locale'; import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue'; import ApprovedIcon from './approved_icon.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; export default { components: { @@ -14,6 +15,7 @@ export default { ApprovalCheckRulePopover, EmptyRuleName, }, + mixins: [glFeatureFlagsMixin()], props: { approvalRules: { type: Array, @@ -92,11 +94,15 @@ export default {