Merge branch 'master' into 3634-tab-state

[arvados.git] / apps / workbench / app / models / collection.rb

diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb
index 40fd930e38a99ae453ff11e01defcedec35af5fb..87a083e24be4ee62d3e52cc5336bb6516ef2d5b2 100644 (file)
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -102,7 +102,7 @@ class Collection < ArvadosBase
     end
   end
 
-  def friendly_link_name
+  def friendly_link_name lookup=nil
     if self.respond_to? :name
       self.name
     else