[ARVADOS] updated: 11a238896a160b8dba4e185a369cda1fd4a55609

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/collections/show.html.erb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

       via  11a238896a160b8dba4e185a369cda1fd4a55609 (commit)
      from  d0f8dba42b3a4c1ca3ae66bb4ad79ec78a1d26d5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 11a238896a160b8dba4e185a369cda1fd4a55609
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jan 2 09:59:46 2014 -0800

    Offer to show html files in browser, too. refs #1748

diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index cc8eec3..d525c78 100644
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -45,7 +45,7 @@
           </td><td>
             <div style="width:3.5em; display:inline-block">
             <%= link_to raw('<i class="icon-download"></i>'), {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'attachment'}, {class: 'label label-info', title: 'Download'} %>
-            <% if file_path.match /\.(txt|pdf|png|jpe?g|gif|tiff?)$/i %>
+            <% if file_path.match /\.(txt|pdf|png|jpe?g|gif|tiff?|html?)$/i %>
             <%= link_to raw('<i class="icon-play"></i>'), {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'inline'}, {class: 'label label-info', title: 'View in browser'} %>
             <% end %>
             </div>

-----------------------------------------------------------------------


hooks/post-receive
--