Merge branch 'djadmin-remove-feedback-alerts' into 'master'

Remove feedback alerts from License Compliance & Dependency List

See merge request gitlab-org/gitlab!43371

ee/app/assets/javascripts/dependencies/components/app.vue

@@ -13,7 +13,6 @@ import DependenciesActions from './dependencies_actions.vue';
 import DependencyListIncompleteAlert from './dependency_list_incomplete_alert.vue';
 import DependencyListJobFailedAlert from './dependency_list_job_failed_alert.vue';
 import PaginatedDependenciesTable from './paginated_dependencies_table.vue';
-import DismissibleFeedbackAlert from '~/vue_shared/components/dismissible_feedback_alert.vue';
 import { DEPENDENCY_LIST_TYPES } from '../store/constants';
 import { REPORT_STATUS } from '../store/modules/list/constants';
 
@@ -30,7 +29,6 @@ export default {
     DependencyListIncompleteAlert,
     DependencyListJobFailedAlert,
     PaginatedDependenciesTable,
-    DismissibleFeedbackAlert,
   },
   props: {
     endpoint: {
@@ -153,15 +151,6 @@ export default {
       @dismiss="dismissJobFailedAlert"
     />
 
-    <!-- 
-      This is a temporary change to solicit feedback from users
-      and shall be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/232618
-    -->
-    <dismissible-feedback-alert
-      feature-name="Dependency List"
-      feedback-link="https://gitlab.com/gitlab-org/gitlab/-/issues/218517/"
-    />
-
     <header class="d-md-flex align-items-end my-3">
       <div class="mr-auto">
         <h2 class="h4 mb-1 mt-0">

ee/app/assets/javascripts/license_compliance/components/app.vue

@@ -15,7 +15,6 @@ import LicenseManagement from 'ee/vue_shared/license_compliance/license_manageme
 import { LICENSE_LIST } from '../store/constants';
 import DetectedLicensesTable from './detected_licenses_table.vue';
 import PipelineInfo from './pipeline_info.vue';
-import DismissibleFeedbackAlert from '~/vue_shared/components/dismissible_feedback_alert.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { getLocationHash } from '~/lib/utils/url_utility';
 
@@ -33,7 +32,6 @@ export default {
     GlBadge,
     GlAlert,
     LicenseManagement,
-    DismissibleFeedbackAlert,
   },
   mixins: [glFeatureFlagsMixin()],
   props: {
@@ -109,15 +107,6 @@ export default {
   />
 
   <div v-else>
-    <!-- 
-      This is a temporary change to solicit feedback from users
-      and shall be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/232618
-    -->
-    <dismissible-feedback-alert
-      feature-name="License Compliance"
-      feedback-link="https://gitlab.com/gitlab-org/gitlab/-/issues/218521"
-    />
-
     <gl-alert v-if="hasPolicyViolations" class="mt-3" variant="warning" :dismissible="false">
       {{
         s__(

ee/changelogs/unreleased/djadmin-remove-feedback-alerts.yml

+---
+title: Remove feedback alerts from License Compliance & Dependency List
+merge_request: 43371
+author:
+type: changed