Merge branch 'master' into 3052-crunch-log-stdout

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

diff --git a/apps/workbench/app/models/user.rb b/apps/workbench/app/models/user.rb
index 87ea5faefa85976b8d11350b291dffc28b2514d7..967ea2ad7d238aebfc9f8df1d4b6e171949479cf 100644 (file)
--- a/apps/workbench/app/models/user.rb
+++ b/apps/workbench/app/models/user.rb
@@ -39,7 +39,7 @@ class User < ArvadosBase
     (not (self.uuid.andand.match(/000000000000000$/) and self.is_admin)) and super
   end
 
-  def friendly_link_name
+  def friendly_link_name lookup=nil
     [self.first_name, self.last_name].compact.join ' '
   end