Merge branch 'wtf8' of git://github.com/bobtfish/Gitalist into action-blame

diff --git a/.gitignore b/.gitignore
index eb75917..968a0c5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.swp
 git-daemon-export-ok
 script/gitalist.cgi
 script/gitalist.fcgi

diff --git a/Makefile.PL b/Makefile.PL
index 20d6539..9b8074e 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -21,6 +21,7 @@ requires 'Catalyst::Runtime' => '5.80003';
 requires 'Catalyst::Plugin::ConfigLoader';
 requires 'Catalyst::Plugin::StackTrace';
 requires 'Catalyst::Plugin::Static::Simple';
+requires 'Catalyst::Plugin::Unicode::Encoding';
 requires 'Catalyst::Action::RenderView';
 requires 'Catalyst::Component::InstancePerContext';
 requires 'Catalyst::View::TT';

diff --git a/lib/Gitalist.pm b/lib/Gitalist.pm
index 9ca78a7..84a9980 100644 (file)
--- a/lib/Gitalist.pm
+++ b/lib/Gitalist.pm
@@ -8,8 +8,10 @@ extends 'Catalyst';
 
 use Catalyst qw/
                 ConfigLoader
+                Unicode::Encoding
                 Static::Simple
-                StackTrace/;
+                StackTrace
+/;
 
 our $VERSION = '0.01';
 

diff --git a/root/_shortlog.tt2 b/root/_shortlog.tt2
index fc39b11..19caaf1 100644 (file)
--- a/root/_shortlog.tt2
+++ b/root/_shortlog.tt2
@@ -26,7 +26,7 @@
    <td class='time-since' title='[% line.authored_time %]'>[% time_since(line.authored_time) %]</td>
    <td class='author'>[% line.author.name | html %]</td>
    <td>
-     [% short_cmt(line.comment) | html_entity %]
+     [% short_cmt(line.comment) | html %]
      [% INCLUDE '_refs.tt2' object = line %]
    </td>
    <td class='action-list'>