From 621dc729f10c7d966f72be87246e659e8b77abfb Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Thu, 21 Oct 2021 13:41:24 +0200
Subject: [PATCH 1/2] Jenkinsfile fixes

---
 Jenkinsfile | 8 ++++++++
 1 file changed, 8 insertions(+)

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}"
             }

From 66eca925d3b919a42d1c073723e477ee03ccc64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 25 Oct 2021 19:07:11 +0200
Subject: [PATCH 2/2] Safari history back

---
 js/clockIn.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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