[ARVADOS] updated: f8de38896834cce639a183daf84c601cd77cc5ee

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/application/_show_object_button.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  f8de38896834cce639a183daf84c601cd77cc5ee (commit)
      from  ade9fc709137c19429ac93eed00550ce8335373e (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 f8de38896834cce639a183daf84c601cd77cc5ee
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jun 6 17:09:34 2014 -0400

    2872: Fix string+nil bug.

diff --git a/apps/workbench/app/views/application/_show_object_button.html.erb b/apps/workbench/app/views/application/_show_object_button.html.erb
index 8d81e08..03a5325 100644
--- a/apps/workbench/app/views/application/_show_object_button.html.erb
+++ b/apps/workbench/app/views/application/_show_object_button.html.erb
@@ -1,6 +1,6 @@
 <% htmloptions = {class: ''}.merge(htmloptions || {})
    htmloptions[:class] += " btn-#{size}" rescue nil
-   link_text = 'Show' unless defined?(link_text)
+   link_text = 'Show' unless defined?(link_text) and link_text
  %>
 <%= link_to_if_arvados_object object, {
       link_text: raw('<i class="fa fa-fw ' + fa_icon_class_for_object(object) + '"></i> ' + link_text),

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


hooks/post-receive
--