kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add permission check for delayed job actions

Browse source
This commit is contained in:
Winnie Hellmann 2018-10-22 21:45:45 +02:00
parent 8ab27e64fe
commit fc0e99df9f
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/environments/components/environment_item.vue
View file

@ -141,7 +141,7 @@ export default {
},
actions() {
if (!this.model || !this.model.last_deployment) {
if (!this.model || !this.model.last_deployment || !this.canCreateDeployment) {
return [];
}
@ -149,11 +149,7 @@ export default {
this.model.last_deployment,
{ deep: true },
);
let combinedActions = [];
if (this.canCreateDeployment) {
combinedActions = combinedActions.concat(manualActions || []);
}
combinedActions = combinedActions.concat(scheduledActions || []);
const combinedActions = (manualActions || []).concat(scheduledActions || []);
return combinedActions.map(action => ({
...action,
name: humanize(action.name),