[ARVADOS] updated: d4bb1f8a3c68288f45d2c1fa618c333825fcc8d0

[Git user]

Summary of changes:
 services/api/app/models/arvados_model.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

       via  d4bb1f8a3c68288f45d2c1fa618c333825fcc8d0 (commit)
       via  aabc7a74ca16c8d72872988354e5e6d32be4fb00 (commit)
       via  4da106ba69c8574366887a32c9e699f9b7410499 (commit)
       via  f90267f98880d40c3038391561c5435e531b0722 (commit)
       via  1ca3acc34896c8f1325925cb017c70bb23eac704 (commit)
      from  02c34d4ceba8fc2b4b7ea64e22f7530f2dca60ef (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 d4bb1f8a3c68288f45d2c1fa618c333825fcc8d0
Merge: 02c34d4 aabc7a7
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 18 20:27:37 2016 -0400

    Merge branch '9684-workflows'
    
    refs #9684


commit aabc7a74ca16c8d72872988354e5e6d32be4fb00
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 18 20:12:25 2016 -0400

    9684: Style nitpicks.

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index 3c79f02..037903c 100644
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -391,15 +391,16 @@ class ArvadosModel < ActiveRecord::Base
       x.each do |k,v|
         return true if has_symbols?(k) or has_symbols?(v)
       end
-      false
     elsif x.is_a? Array
       x.each do |k|
         return true if has_symbols?(k)
       end
-      false
-    else
-      (x.class == Symbol) or (x.class == String and x.start_with?(':') and !x.start_with?('::'))
+    elsif x.is_a? Symbol
+      return true
+    elsif x.is_a? String
+      return true if x.start_with?(':') && !x.start_with?('::')
     end
+    false
   end
 
   def self.recursive_stringify x
@@ -413,12 +414,10 @@ class ArvadosModel < ActiveRecord::Base
       end
     elsif x.is_a? Symbol
       x.to_s
+    elsif x.is_a? String and x.start_with?(':') and !x.start_with?('::')
+      x[1..-1]
     else
-      if x.is_a? String and x.start_with?(':') and !x.start_with?('::')
-        x[1..-1]
-      else
-        x
-      end
+      x
     end
   end
 

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


hooks/post-receive
--