YunoHost/tartiflette
1
0
Fork 0
mirror of https://github.com/YunoHost/tartiflette.git synced 2024-09-03 20:06:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Handle 'HEAD' case when checking if commit is up to date

Browse source
This commit is contained in:
Alexandre Aubin 2018-05-26 18:21:30 +02:00
parent a078ad3aeb
commit 50fe2547a5
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/templates/appci_app.html
View file

@ -64,7 +64,12 @@
<div class="col-sm-4 offset-sm-4"> <div class="col-sm-4 offset-sm-4">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
{% if app.public_commit == app.master_commit %} {% if result.app.public_commit == 'HEAD' %}
<p class="card-text text-success">
<span class="oi oi-task" aria-hidden="true"></span>
This app points to HEAD in {{ app.list.name }}.json !
</p>
{% elif app.public_commit == app.master_commit %}
<p class="card-text text-success"> <p class="card-text text-success">
<span class="oi oi-task" aria-hidden="true"></span> <span class="oi oi-task" aria-hidden="true"></span>
Master commit is up to date with {{ app.list.name }}.json ! Master commit is up to date with {{ app.list.name }}.json !

2
app/templates/appci_branch.html
View file

@ -86,7 +86,7 @@
aria-hidden="true" aria-hidden="true"
title="This test is outdated : a more recent commit exists in master than the one tested."></span> title="This test is outdated : a more recent commit exists in master than the one tested."></span>
{% endif %} {% 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 %} {% if result.app.public_vs_master_time_diff > 60 %}
<span class="oi oi-warning text-danger" <span class="oi oi-warning text-danger"
{% else %} {% else %}