From 0b0dbe0dee80ca71ff43a54641d616c131e6fd8a Mon Sep 17 00:00:00 2001
From: Axel Hahn <axel.hahn@iml.unibe.ch>
Date: Fri, 12 Dec 2014 16:35:38 +0100
Subject: [PATCH] - added: skip dereferenced tags in git (tags ending ^{} ) -
added: modal infobox in build page if you switch the branch - added: git uses
a cache for taglist and revision infos (ttl is 5 min)
---
public_html/deployment/classes/html.tpl.php | 4 ++++
public_html/deployment/classes/vcs.git.class.php | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/public_html/deployment/classes/html.tpl.php b/public_html/deployment/classes/html.tpl.php
index c2296db4..76b2cfa1 100644
--- a/public_html/deployment/classes/html.tpl.php
+++ b/public_html/deployment/classes/html.tpl.php
@@ -15,6 +15,7 @@
<link href="/deployment/bootstrap/css/bootstrap.css" rel="stylesheet">
<link href="/deployment/bootstrap/css/styles.css" type="text/css" rel="stylesheet" />
<script src="/deployment/bootstrap/js/jquery-1.8.0.min.js"></script>
+ <!-- <script src="/deployment/bootstrap/js/jquery-2.1.1.min.js"></script> -->
<title>IML Deployment</title>
<link rel="stylesheet" type="text/css" href="/deployment/main.css" media="screen">
@@ -33,6 +34,9 @@
<script src="/deployment/bootstrap/js/bootstrap.min.js"></script>
<script src="/deployment/js/functions.js"></script>
+ <div id="divmodal">
+ <div id="divmodalmessage">please wait ...</div>
+ </div>
</body>
</html>
diff --git a/public_html/deployment/classes/vcs.git.class.php b/public_html/deployment/classes/vcs.git.class.php
index 9b421b81..fd1f6db6 100644
--- a/public_html/deployment/classes/vcs.git.class.php
+++ b/public_html/deployment/classes/vcs.git.class.php
@@ -176,7 +176,7 @@ class vcs implements iVcs {
$iTtl=300; // cache for 5 min
require_once 'cache.class.php';
$oCache=new AhCache($this->_getNameOfCacheModule(), "RemoteBranches");
- if ($oCache->isExpired() || $bForceNoCache || true){
+ if ($oCache->isExpired() || $bForceNoCache){
if (!file_exists($this->_sTempDir . ".git")) {
$sGitCmd.='mkdir "' . $this->_sTempDir . '" && cd "' . $this->_sTempDir . '" && ';
$sGitCmd.='git init >/dev/null && ';
--
GitLab