diff options
| author | James Moger <james.moger@gitblit.com> | 2014-10-06 13:49:08 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-10-06 13:49:08 -0400 |
| commit | 12f1be179dfb6f02b1a59594d36a9663a2d78742 (patch) | |
| tree | bca2889c2656d13f37951f346b548ce33ef7cd22 | |
| parent | f685ea581f94373a63bcdc94ec417fdf92a95d68 (diff) | |
| parent | 1bfe119cc7b46f80f4568e92b00893b98592753e (diff) | |
| download | gitblit-12f1be179dfb6f02b1a59594d36a9663a2d78742.tar.gz gitblit-12f1be179dfb6f02b1a59594d36a9663a2d78742.zip | |
Merge branch 'ticket/202' into develop
| -rw-r--r-- | src/main/distrib/data/gitblit.properties | 2 | ||||
| -rw-r--r-- | src/test/config/test-gitblit.properties | 2 | ||||
| -rw-r--r-- | src/test/config/test-ui-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 407a4831..f53cc112 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -1322,7 +1322,7 @@ web.tracwikiExtensions = tracwiki # # 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 1a52eaf4..78e9ab95 100644 --- a/src/test/config/test-gitblit.properties +++ b/src/test/config/test-gitblit.properties @@ -51,7 +51,7 @@ web.summaryRefsCount = 5 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 c77de1a2..877cbe2a 100644 --- a/src/test/config/test-ui-gitblit.properties +++ b/src/test/config/test-ui-gitblit.properties @@ -746,7 +746,7 @@ web.markdownExtensions = md mkd markdown MD MKD #
# 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
#
|