diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 12:13:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 12:13:07 +0300 |
commit | 6cd4578a23ffe0fb94632f83a07a25d01f8d6821 (patch) | |
tree | d21e9881e4ceb8ae6f28451f0797acc59e7cd1e8 /app/assets/javascripts/environments | |
parent | b6a194f6625042a09e083443c3326cc61aefc4c0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/environments')
-rw-r--r-- | app/assets/javascripts/environments/components/stop_environment_modal.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/environments/components/stop_environment_modal.vue b/app/assets/javascripts/environments/components/stop_environment_modal.vue index dc0c5dc0f46..95ece2b653e 100644 --- a/app/assets/javascripts/environments/components/stop_environment_modal.vue +++ b/app/assets/javascripts/environments/components/stop_environment_modal.vue @@ -41,6 +41,9 @@ export default { text: __('Cancel'), }; }, + hasStopAction() { + return this.graphql ? this.environment.hasStopAction : this.environment.has_stop_action; + }, }, methods: { @@ -81,7 +84,7 @@ export default { <p>{{ s__('Environments|Are you sure you want to stop this environment?') }}</p> - <div v-if="!environment.has_stop_action" class="warning_message"> + <div v-if="!hasStopAction" class="warning_message"> <p> <gl-sprintf :message=" |