diff --git a/Jenkinsfile b/Jenkinsfile index c9830b4..a13e2bb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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}" } diff --git a/js/clockIn.js b/js/clockIn.js index 3490712..67f22cd 100644 --- a/js/clockIn.js +++ b/js/clockIn.js @@ -173,6 +173,6 @@ function cerrar(){ $(".loading").fadeIn(200); localStorage.removeItem("userData"); setTimeout(function () { - window.history.back(); + window.location='index.html'; }, 200); } \ No newline at end of file