Merge branch '10080-env-contaier' into 'master'

Removes ee differences for container.vue

Closes gitlab-ee#10080

See merge request gitlab-org/gitlab-ce!25957

app/assets/javascripts/environments/components/container.vue

@@ -1,14 +1,16 @@
 <script>
 import { GlLoadingIcon } from '@gitlab/ui';
-import tablePagination from '../../vue_shared/components/table_pagination.vue';
+import TablePagination from '~/vue_shared/components/table_pagination.vue';
-import environmentTable from '../components/environments_table.vue';
+import containerMixin from 'ee_else_ce/environments/mixins/container_mixin';
+import EnvironmentTable from '../components/environments_table.vue';
 
 export default {
   components: {
-    environmentTable,
+    EnvironmentTable,
-    tablePagination,
+    TablePagination,
     GlLoadingIcon,
   },
+  mixins: [containerMixin],
   props: {
     isLoading: {
       type: Boolean,
@@ -47,7 +49,15 @@ export default {
     <slot name="emptyState"></slot>
 
     <div v-if="!isLoading && environments.length > 0" class="table-holder">
-      <environment-table :environments="environments" :can-read-environment="canReadEnvironment" />
+      <environment-table
+        :environments="environments"
+        :can-read-environment="canReadEnvironment"
+        :canary-deployment-feature-id="canaryDeploymentFeatureId"
+        :show-canary-deployment-callout="showCanaryDeploymentCallout"
+        :user-callouts-path="userCalloutsPath"
+        :lock-promotion-svg-path="lockPromotionSvgPath"
+        :help-canary-deployments-path="helpCanaryDeploymentsPath"
+      />
 
       <table-pagination
         v-if="pagination && pagination.totalPages > 1"

app/assets/javascripts/environments/mixins/container_mixin.js

@@ -0,0 +1,29 @@
+export default {
+  props: {
+    canaryDeploymentFeatureId: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    showCanaryDeploymentCallout: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    userCalloutsPath: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    lockPromotionSvgPath: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    helpCanaryDeploymentsPath: {
+      type: String,
+      required: false,
+      default: null,
+    },
+  },
+};