[ARVADOS] updated: ce02e1cb45e3189e5dbf9f517cc09ab3aaf1934f

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/users/_tables.html.erb    |   20 ++++++++++----------
 .../api/app/controllers/application_controller.rb  |    3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

       via  ce02e1cb45e3189e5dbf9f517cc09ab3aaf1934f (commit)
       via  deef76cfbc581937c2327ba9178a9c84b8b1a97c (commit)
       via  10c628c825ca50e7a054606da85947cbeff2f16f (commit)
      from  aefca1ea37be9e98c9ee07be918fa8249212faa8 (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 ce02e1cb45e3189e5dbf9f517cc09ab3aaf1934f
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 8 10:14:53 2014 -0800

    Fix up collection links on workbench home page.

diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index d11e4db..cec0d87 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -37,7 +37,7 @@
 		  <a href="<%= collection_path(j.output) %>">
 		    <% Collection.limit(1).where(uuid: j.output).each do |c|
 			 c.files.each do |file| %>
-		      <%= "#{file[0]}/#{file[1]}" %>
+		      <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %>
 		    <% end %>
 		<% end %>
 		</a>
@@ -48,7 +48,7 @@
 
 <td>
   <small>
-    <% if j.success %>
+    <% if j.log %>
       <a href="<%= collection_path(j.log) %>">Log</a>
     <% end %>
   </small>
@@ -160,7 +160,7 @@
             <small>
 	      <a href="<%= collection_path(c.uuid) %>">
 		<% c.files.each do |file| %>
-		  <%= "#{file[0]}/#{file[1]}" %>
+		  <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %>
 		<% end %>
 	      </a>
             </small>

commit deef76cfbc581937c2327ba9178a9c84b8b1a97c
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 8 10:09:34 2014 -0800

    Fix up "age" column contents on workbench home page.

diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index c52057c..d11e4db 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -18,8 +18,8 @@
 	  <th>Script</th>
 	  <th>Output</th>
 	  <th>Log</th>
-	  <th>Status</th>
 	  <th>Age</th>
+	  <th>Status</th>
 	</tr>
 
         <% @my_jobs[0..6].each do |j| %>
@@ -56,8 +56,8 @@
 
 <td>
   <small>
-    <%= raw(distance_of_time_in_words(j[:created_at], Time.now).sub('about
-','~').sub(' ',' ')) if j[:created_at] %> ago
+    <%= raw(distance_of_time_in_words(j.created_at, Time.now).sub('about
+','~').sub(' ',' ')) if j.created_at %>
   </small>
 </td>
 
@@ -114,8 +114,8 @@
 
           <td>
             <small>
-	      <%= raw(distance_of_time_in_words(p[:created_at], Time.now).sub('about
-','~').sub(' ',' ')) if p[:created_at] %> ago
+	      <%= raw(distance_of_time_in_words(p.created_at, Time.now).sub('about
+','~').sub(' ',' ')) if p.created_at %>
             </small>
           </td>
 
@@ -167,8 +167,8 @@
           </td>
           <td>
             <small>
-	      <%= raw(distance_of_time_in_words(c[:created_at], Time.now).sub('about
-','~').sub(' ',' ')) if c[:created_at] %> ago
+	      <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about
+','~').sub(' ',' ')) if c.created_at %>
             </small>
           </td>
         </tr>

commit 10c628c825ca50e7a054606da85947cbeff2f16f
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 8 10:05:33 2014 -0800

    Fix check for whether adding response[:_profile] is safe. refs #1815

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 13ee6ab..d439779 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -367,9 +367,8 @@ class ApplicationController < ActionController::Base
 
   def render *opts
     response = opts.first[:json]
-    if response &&
+    if response.is_a?(Hash) &&
         params[:_profile] &&
-        response.respond_to?(:[]) &&
         Thread.current[:request_starttime]
       response[:_profile] = {
          request_time: Time.now - Thread.current[:request_starttime]

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


hooks/post-receive
--