From aaefdc994e0cd827a78bb1c51ed2ea11177b8b6c Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Thu, 14 Mar 2019 16:21:23 +0000 Subject: [PATCH] Removes EE differences for environments_folder_bundle --- .../folder/environments_folder_bundle.js | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/environments/folder/environments_folder_bundle.js b/app/assets/javascripts/environments/folder/environments_folder_bundle.js index 7fe3e6327b1ab0..c1bfe8d05feb02 100644 --- a/app/assets/javascripts/environments/folder/environments_folder_bundle.js +++ b/app/assets/javascripts/environments/folder/environments_folder_bundle.js @@ -1,12 +1,9 @@ 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, }, }); }, -- GitLab