From 50fe2547a5d21ec8b1cb8716f2584bc61ed8d2b4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 26 May 2018 18:21:30 +0200 Subject: [PATCH] Handle 'HEAD' case when checking if commit is up to date --- app/templates/appci_app.html | 7 ++++++- app/templates/appci_branch.html | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/templates/appci_app.html b/app/templates/appci_app.html index 71dcc8f..b5b5a3d 100644 --- a/app/templates/appci_app.html +++ b/app/templates/appci_app.html @@ -64,7 +64,12 @@
- {% if app.public_commit == app.master_commit %} + {% if result.app.public_commit == 'HEAD' %} +

+ + This app points to HEAD in {{ app.list.name }}.json ! +

+ {% elif app.public_commit == app.master_commit %}

Master commit is up to date with {{ app.list.name }}.json ! diff --git a/app/templates/appci_branch.html b/app/templates/appci_branch.html index 92d48a9..cc7c728 100644 --- a/app/templates/appci_branch.html +++ b/app/templates/appci_branch.html @@ -86,7 +86,7 @@ aria-hidden="true" title="This test is outdated : a more recent commit exists in master than the one tested."> {% endif %} - {% if result.app.public_commit != result.app.master_commit %} + {% if result.app.public_commit != 'HEAD' and result.app.public_commit != result.app.master_commit %} {% if result.app.public_vs_master_time_diff > 60 %}