Commit 1efc7435 authored by Phil Hughes's avatar Phil Hughes

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

EE: Removes ee differences for container.vue

See merge request gitlab-org/gitlab-ee!9950
parents 443de2a1 9d075f63
<script>
import { GlLoadingIcon } from '@gitlab/ui';
import tablePagination from '../../vue_shared/components/table_pagination.vue';
import environmentTable from '../components/environments_table.vue';
import TablePagination from '~/vue_shared/components/table_pagination.vue';
import containerMixin from 'ee_else_ce/environments/mixins/container_mixin';
import EnvironmentTable from '../components/environments_table.vue';
export default {
components: {
environmentTable,
tablePagination,
EnvironmentTable,
TablePagination,
GlLoadingIcon,
},
mixins: [containerMixin],
props: {
isLoading: {
type: Boolean,
......@@ -26,28 +28,6 @@ export default {
type: Boolean,
required: true,
},
// ee-only start
canaryDeploymentFeatureId: {
type: String,
required: true,
},
showCanaryDeploymentCallout: {
type: Boolean,
required: true,
},
userCalloutsPath: {
type: String,
required: true,
},
lockPromotionSvgPath: {
type: String,
required: true,
},
helpCanaryDeploymentsPath: {
type: String,
required: true,
},
// ee-only end
},
methods: {
onChangePage(page) {
......
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,
},
},
};
export default {
props: {
canaryDeploymentFeatureId: {
type: String,
required: true,
},
showCanaryDeploymentCallout: {
type: Boolean,
required: true,
},
userCalloutsPath: {
type: String,
required: true,
},
lockPromotionSvgPath: {
type: String,
required: true,
},
helpCanaryDeploymentsPath: {
type: String,
required: true,
},
},
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment