Merge branch '10079-env-app' into 'master'
Removes EE differences for environments_app Closes gitlab-ee#10079 See merge request gitlab-org/gitlab-ce!26030
This commit is contained in:
commit
77d22d3721
|
@ -1,4 +1,5 @@
|
|||
<script>
|
||||
import envrionmentsAppMixin from 'ee_else_ce/environments/mixins/environments_app_mixin';
|
||||
import Flash from '../../flash';
|
||||
import { s__ } from '../../locale';
|
||||
import emptyState from './empty_state.vue';
|
||||
|
@ -15,7 +16,7 @@ export default {
|
|||
ConfirmRollbackModal,
|
||||
},
|
||||
|
||||
mixins: [CIPaginationMixin, environmentsMixin],
|
||||
mixins: [CIPaginationMixin, environmentsMixin, envrionmentsAppMixin],
|
||||
|
||||
props: {
|
||||
endpoint: {
|
||||
|
@ -95,9 +96,9 @@ export default {
|
|||
<tabs :tabs="tabs" scope="environments" @onChangeTab="onChangeTab" />
|
||||
|
||||
<div v-if="canCreateEnvironment && !isLoading" class="nav-controls">
|
||||
<a :href="newEnvironmentPath" class="btn btn-success">{{
|
||||
s__('Environments|New environment')
|
||||
}}</a>
|
||||
<a :href="newEnvironmentPath" class="btn btn-success">
|
||||
{{ s__('Environments|New environment') }}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -106,6 +107,11 @@ export default {
|
|||
:environments="state.environments"
|
||||
:pagination="state.paginationInformation"
|
||||
: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"
|
||||
@onChangePage="onChangePage"
|
||||
>
|
||||
<empty-state
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
export default {
|
||||
props: {
|
||||
canaryDeploymentFeatureId: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: '',
|
||||
},
|
||||
showCanaryDeploymentCallout: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: false,
|
||||
},
|
||||
userCalloutsPath: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: '',
|
||||
},
|
||||
lockPromotionSvgPath: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: '',
|
||||
},
|
||||
helpCanaryDeploymentsPath: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: '',
|
||||
},
|
||||
},
|
||||
metods: {
|
||||
toggleDeployBoard() {},
|
||||
},
|
||||
};
|
|
@ -13,6 +13,11 @@ describe('Environment', () => {
|
|||
cssContainerClass: 'container',
|
||||
newEnvironmentPath: 'environments/new',
|
||||
helpPagePath: 'help',
|
||||
canaryDeploymentFeatureId: 'canary_deployment',
|
||||
showCanaryDeploymentCallout: true,
|
||||
userCalloutsPath: '/callouts',
|
||||
lockPromotionSvgPath: '/assets/illustrations/lock-promotion.svg',
|
||||
helpCanaryDeploymentsPath: 'help/canary-deployments',
|
||||
};
|
||||
|
||||
let EnvironmentsComponent;
|
||||
|
|
Loading…
Reference in New Issue