Commit bc132812 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'nt/ce-to-ee-thursday' of gitlab.com:gitlab-org/gitlab-ee into nt/ce-to-ee-thursday

parents 7a40365d f85b426e
......@@ -29,7 +29,6 @@ export default {
this.isLoading = true;
$(this.$refs.tooltip).tooltip('destroy');
eventHub.$emit('postAction', endpoint);
},
......
......@@ -47,11 +47,6 @@ export default {
required: false,
},
service: {
type: Object,
required: true,
default: () => ({}),
},
},
computed: {
......
......@@ -18,12 +18,6 @@ export default {
type: Boolean,
default: true,
},
service: {
type: Object,
required: true,
default: () => ({}),
},
},
data() {
......
......@@ -11,12 +11,6 @@ export default {
type: String,
default: '',
},
service: {
type: Object,
required: true,
default: () => ({}),
},
},
data() {
......
......@@ -87,7 +87,6 @@ export default {
:model="model"
:can-create-deployment="canCreateDeployment"
:can-read-environment="canReadEnvironment"
:service="service"
:toggleDeployBoard="toggleDeployBoard"
/>
......@@ -121,6 +120,7 @@ export default {
:can-read-environment="canReadEnvironment"
/>
<tr>
<td
colspan="6"
......
......@@ -181,13 +181,10 @@ export default {
:environments="state.environments"
:can-create-deployment="canCreateDeploymentParsed"
:can-read-environment="canReadEnvironmentParsed"
<<<<<<< HEAD
:toggleDeployBoard="toggleDeployBoard"
:store="store"
:service="service"/>
=======
:service="service"
/>
>>>>>>> ce/master
<table-pagination
v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
......
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