Merge branch 'ee-10027-folder-bundle' into 'master'

EE: Removes EE differences for environments_folder_bundle

See merge request gitlab-org/gitlab-ee!10077

app/assets/javascripts/environments/folder/environments_folder_bundle.js

 import Vue from 'vue';
+import canaryCalloutMixin from 'ee_else_ce/environments/mixins/canary_callout_mixin';
 import environmentsFolderApp from './environments_folder_view.vue';
 import { parseBoolean } from '../../lib/utils/common_utils';
 import Translate from '../../vue_shared/translate';
 
-// ee-only start
-import CanaryCalloutMixin from 'ee/environments/mixins/canary_callout_mixin'; // eslint-disable-line import/order
-// ee-only end
-
 Vue.use(Translate);
 
 export default () =>
@@ -15,9 +12,7 @@ export default () =>
     components: {
       environmentsFolderApp,
     },
-    // ee-only start
-    mixins: [CanaryCalloutMixin],
-    // ee-only end
+    mixins: [canaryCalloutMixin],
     data() {
       const environmentsData = document.querySelector(this.$options.el).dataset;
 
@@ -35,13 +30,7 @@ export default () =>
           folderName: this.folderName,
           cssContainerClass: this.cssContainerClass,
           canReadEnvironment: this.canReadEnvironment,
-          // ee-only start
-          canaryDeploymentFeatureId: this.canaryDeploymentFeatureId,
-          showCanaryDeploymentCallout: this.showCanaryDeploymentCallout,
-          userCalloutsPath: this.userCalloutsPath,
-          lockPromotionSvgPath: this.lockPromotionSvgPath,
-          helpCanaryDeploymentsPath: this.helpCanaryDeploymentsPath,
-          // ee-only end
+          ...this.canaryCalloutProps,
         },
       });
     },