verdnatura/worker-time-control
verdnatura
/
worker-time-control
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'Safari history back' (#2) from test into master
gitea/worker-time-control/pipeline/head This commit looks good Details 

Reviewed-on: #2
This commit is contained in:
Carlos Andrés 2021-10-26 09:32:56 +00:00
parent c5f8fbfbf2 66eca925d3
commit 1213bf11f8
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile vendored
View File

@ -13,6 +13,10 @@ pipeline {
} }
} }
stage('Build') { stage('Build') {
when { anyOf {
branch 'test'
branch 'master'
}}
environment { environment {
CREDENTIALS = credentials('docker-registry') CREDENTIALS = credentials('docker-registry')
} }
@ -21,6 +25,10 @@ pipeline {
} }
} }
stage('Deploy') { stage('Deploy') {
when { anyOf {
branch 'test'
branch 'master'
}}
environment { environment {
DOCKER_HOST = "${env.SWARM_HOST}" DOCKER_HOST = "${env.SWARM_HOST}"
} }

2
js/clockIn.js
View File

@ -173,6 +173,6 @@ function cerrar(){
$(".loading").fadeIn(200); $(".loading").fadeIn(200);
localStorage.removeItem("userData"); localStorage.removeItem("userData");
setTimeout(function () { setTimeout(function () {
window.history.back(); window.location='index.html';
}, 200); }, 200);
} }