diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-08-03 23:16:36 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-08-03 23:16:36 +0000 |
| commit | c2c9b3ddc71053cc9bc3754c8c6007ad8b6f653c (patch) | |
| tree | 26e17429a550cf8cd0cdb336e7636a721e193f33 | |
| parent | 955e4e9825eace161c2c04eaac7d64e42bdf2d44 (diff) | |
| parent | 7e793af32134fb6d2958be3ca5cbfd88bc6ec397 (diff) | |
| download | gitlab-ce-c2c9b3ddc71053cc9bc3754c8c6007ad8b6f653c.tar.gz | |
Merge branch 'mg-revert-unneeded-changes-protected-environments' into 'master'
Revert some unneeded code changes from environment list
See merge request gitlab-org/gitlab-ce!21026
| -rw-r--r-- | app/assets/javascripts/environments/components/environment_item.vue | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index 0886ea59a47..21cf92d1bc5 100644 --- a/app/assets/javascripts/environments/components/environment_item.vue +++ b/app/assets/javascripts/environments/components/environment_item.vue @@ -87,18 +87,6 @@ export default { }, /** - * Checkes whether the user is allowed to deploy to this environment. - * (`can_deploy` currently only set in EE) - * - * @returns {Boolean} - */ - isDeployableByUser() { - return this.model && 'can_deploy' in this.model - ? this.model.can_deploy - : this.canCreateDeployment; - }, - - /** * Checkes whether the environment is protected. * (`is_protected` currently only set in EE) * @@ -635,7 +623,7 @@ export default { /> <actions-component - v-if="hasManualActions && isDeployableByUser" + v-if="hasManualActions && canCreateDeployment" :actions="manualActions" /> @@ -645,7 +633,7 @@ export default { /> <rollback-component - v-if="canRetry && isDeployableByUser" + v-if="canRetry && canCreateDeployment" :is-last-deployment="isLastDeployment" :retry-url="retryUrl" /> |