[ARVADOS] updated: 8fc3ca1a1f521dfe77ebeb2b9b26691dab0313f8

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb          | 18 ++++++++----------
 .../app/views/application/_selection_checkbox.html.erb |  2 +-
 .../app/views/collections/_choose_rows.html.erb        |  2 --
 3 files changed, 9 insertions(+), 13 deletions(-)

       via  8fc3ca1a1f521dfe77ebeb2b9b26691dab0313f8 (commit)
       via  4bd75291b6e3c6ae2a5c7efd17ee27dfd844f4e0 (commit)
       via  4e900962d49cc0fe7832854c2eee0c45bfabba38 (commit)
      from  cdd94fae8d40ad6dcee3de5d36de2d89921fd12d (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 8fc3ca1a1f521dfe77ebeb2b9b26691dab0313f8
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jun 23 09:35:31 2014 -0400

    Remove spurious puts. refs #2884

diff --git a/apps/workbench/app/views/collections/_choose_rows.html.erb b/apps/workbench/app/views/collections/_choose_rows.html.erb
index 5cce19a..d87f56f 100644
--- a/apps/workbench/app/views/collections/_choose_rows.html.erb
+++ b/apps/workbench/app/views/collections/_choose_rows.html.erb
@@ -1,7 +1,5 @@
 <% @name_links.each do |name_link| %>
-  <% puts "looking up #{name_link.head_uuid}" %>
   <% if (object = get_object(name_link.head_uuid)) %>
-    <% puts "got #{object}" %>
     <div class="row filterable selectable <%= 'multiple' if multiple %>" data-object-uuid="<%= name_link.uuid %>"
          data-preview-href="<%= url_for object %>?tab_pane=chooser_preview"
          style="margin-left: 1em; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #DDDDDD">

commit 4bd75291b6e3c6ae2a5c7efd17ee27dfd844f4e0
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jun 23 09:34:41 2014 -0400

    Fix crash on unexpected case of a collection whose owner_uuid is not root.
    closes #3047

diff --git a/apps/workbench/app/views/application/_selection_checkbox.html.erb b/apps/workbench/app/views/application/_selection_checkbox.html.erb
index 25aef94..de880dd 100644
--- a/apps/workbench/app/views/application/_selection_checkbox.html.erb
+++ b/apps/workbench/app/views/application/_selection_checkbox.html.erb
@@ -1,4 +1,4 @@
-<%if object and (object.class.goes_in_projects? or (object.is_a?(Link) and ArvadosBase::resource_class_for_uuid(object.head_uuid).to_s == 'Collection')) %>
+<%if object and object.uuid and (object.class.goes_in_projects? or (object.is_a?(Link) and ArvadosBase::resource_class_for_uuid(object.head_uuid).to_s == 'Collection')) %>
   <% fn = if defined? friendly_name
             friendly_name
           else

commit 4e900962d49cc0fe7832854c2eee0c45bfabba38
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jun 23 09:30:30 2014 -0400

    Handle UrlGenerationError as an application exception rather than a
    404, even though it subclasses RoutingError. refs #3047

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 9e918f5..22a5c49 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -16,16 +16,14 @@ class ApplicationController < ActionController::Base
   theme :select_theme
 
   begin
-    rescue_from Exception,
-    :with => :render_exception
-    rescue_from ActiveRecord::RecordNotFound,
-    :with => :render_not_found
-    rescue_from ActionController::RoutingError,
-    :with => :render_not_found
-    rescue_from ActionController::UnknownController,
-    :with => :render_not_found
-    rescue_from ::AbstractController::ActionNotFound,
-    :with => :render_not_found
+    rescue_from(ActiveRecord::RecordNotFound,
+                ActionController::RoutingError,
+                ActionController::UnknownController,
+                AbstractController::ActionNotFound,
+                with: :render_not_found)
+    rescue_from(Exception,
+                ActionController::UrlGenerationError,
+                with: :render_exception)
   end
 
   def unprocessable(message=nil)

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


hooks/post-receive
--