Merge branch 'jw/commit-decorations'

Conflicts:
	cgit.css

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/ui-commit.c b/ui-commit.c
index a6a85a4..41ce70e 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -10,6 +10,7 @@
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"
+#include "ui-log.h"
 
 void cgit_print_commit(char *hex)
 {
@@ -34,6 +35,8 @@ void cgit_print_commit(char *hex)
         }
         info = cgit_parse_commit(commit);
 
+        load_ref_decorations();
+
         html("<table summary='commit info' class='commit-info'>\n");
         html("<tr><th>author</th><td>");
         html_txt(info->author);
@@ -87,6 +90,7 @@ void cgit_print_commit(char *hex)
         html("</table>\n");
         html("<div class='commit-subject'>");
         html_txt(info->subject);
+        show_commit_decorations(commit);
         html("</div>");
         html("<div class='commit-msg'>");
         html_txt(info->msg);