From 498351b0a1f674bf5e665addfb4c68be9720158e Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 06 Oct 2014 14:00:24 -0400 Subject: [PATCH] Merged #202 "Treat .ico and .jpeg files as images" --- src/test/config/test-ui-gitblit.properties | 2 +- src/main/distrib/data/gitblit.properties | 2 +- src/test/config/test-gitblit.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 407a483..f53cc11 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -1322,7 +1322,7 @@ # # SPACE-DELIMITED # SINCE 0.5.0 -web.imageExtensions = bmp jpg gif png +web.imageExtensions = bmp jpg jpeg gif png ico # Registered extensions for binary blobs # diff --git a/src/test/config/test-gitblit.properties b/src/test/config/test-gitblit.properties index 1a52eaf..78e9ab9 100644 --- a/src/test/config/test-gitblit.properties +++ b/src/test/config/test-gitblit.properties @@ -51,7 +51,7 @@ web.itemsPerPage = 50 web.prettyPrintExtensions = c cpp cs css htm html java js php pl prefs properties py rb sh sql xml vb web.markdownExtensions = md mkd markdown MD MKD -web.imageExtensions = bmp jpg gif png +web.imageExtensions = bmp jpg jpeg gif png ico web.binaryExtensions = jar pdf tar.gz zip web.aggressiveHeapManagement = false web.debugMode = false diff --git a/src/test/config/test-ui-gitblit.properties b/src/test/config/test-ui-gitblit.properties index c77de1a..877cbe2 100644 --- a/src/test/config/test-ui-gitblit.properties +++ b/src/test/config/test-ui-gitblit.properties @@ -746,7 +746,7 @@ # # SPACE-DELIMITED # SINCE 0.5.0 -web.imageExtensions = bmp jpg gif png +web.imageExtensions = bmp jpg jpeg gif png ico # Registered extensions for binary blobs # -- Gitblit v1.9.1