Merge pull request 'Safari history back' (#2) from test into master
gitea/worker-time-control/pipeline/head This commit looks good
Details
gitea/worker-time-control/pipeline/head This commit looks good
Details
Reviewed-on: #2
This commit is contained in:
commit
1213bf11f8
|
@ -13,6 +13,10 @@ pipeline {
|
|||
}
|
||||
}
|
||||
stage('Build') {
|
||||
when { anyOf {
|
||||
branch 'test'
|
||||
branch 'master'
|
||||
}}
|
||||
environment {
|
||||
CREDENTIALS = credentials('docker-registry')
|
||||
}
|
||||
|
@ -21,6 +25,10 @@ pipeline {
|
|||
}
|
||||
}
|
||||
stage('Deploy') {
|
||||
when { anyOf {
|
||||
branch 'test'
|
||||
branch 'master'
|
||||
}}
|
||||
environment {
|
||||
DOCKER_HOST = "${env.SWARM_HOST}"
|
||||
}
|
||||
|
|
|
@ -173,6 +173,6 @@ function cerrar(){
|
|||
$(".loading").fadeIn(200);
|
||||
localStorage.removeItem("userData");
|
||||
setTimeout(function () {
|
||||
window.history.back();
|
||||
window.location='index.html';
|
||||
}, 200);
|
||||
}
|
Loading…
Reference in New Issue