Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-11-23 20:35:24 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(be): ignore max parallel tasks if it is 0

Browse Source
This commit is contained in:
Denis Gukov 2023-09-17 22:06:28 +02:00
parent cb2bcd8f0b
commit e6c72fb330
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/tasks/TaskPool.go
View File

@ -178,7 +178,7 @@ func (p *TaskPool) Run() {
func (p *TaskPool) blocks(t *TaskRunner) bool { func (p *TaskPool) blocks(t *TaskRunner) bool {
if len(p.runningTasks) >= util.Config.MaxParallelTasks { if util.Config.MaxParallelTasks > 0 && len(p.runningTasks) >= util.Config.MaxParallelTasks {
return true return true
} }

12
web/src/lang/pt.js
View File

@ -200,9 +200,9 @@ export default {
gitUrl: 'URL Git', gitUrl: 'URL Git',
sshKey: 'Chave SSH', sshKey: 'Chave SSH',
lastTask: 'Última Tarefa', lastTask: 'Última Tarefa',
task2: 'Tarefa', // task2: 'Tarefa',
build: 'Compilar', // build: 'Compilar',
deploy: 'Implementar', // deploy: 'Implementar',
run: 'Executar', run: 'Executar',
add: 'Adicionar', add: 'Adicionar',
password_required: 'Palavra-passe obrigatória', password_required: 'Palavra-passe obrigatória',
@ -227,8 +227,8 @@ export default {
environment_required: 'Ambiente obrigatório', environment_required: 'Ambiente obrigatório',
email_required: 'E-mail obrigatório', email_required: 'E-mail obrigatório',
build_template_required: 'Modelo de compilação obrigatório', build_template_required: 'Modelo de compilação obrigatório',
Task: 'Tarefa', // Task: 'Tarefa',
Build: 'Compilar', // Build: 'Compilar',
Deploy: 'Implementar', // Deploy: 'Implementar',
Run: 'Executar', Run: 'Executar',
}; };

1
web/src/views/project/History.vue
View File

@ -16,6 +16,7 @@
:to="`/project/${projectId}/settings`" :to="`/project/${projectId}/settings`"
>{{ $t('settings') }} >{{ $t('settings') }}
</v-tab> </v-tab>
<v-tab key="history" :to="`/project/${projectId}/billing`">{{ $t('billing') }}</v-tab>
</v-tabs> </v-tabs>
<v-data-table <v-data-table