[ARVADOS] updated: 4da106ba69c8574366887a32c9e699f9b7410499

[Git user]

Summary of changes:
 services/api/app/models/arvados_model.rb      | 8 ++++++--
 services/api/config/initializers/safe_yaml.rb | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 services/api/config/initializers/safe_yaml.rb

       via  4da106ba69c8574366887a32c9e699f9b7410499 (commit)
       via  f90267f98880d40c3038391561c5435e531b0722 (commit)
      from  1ca3acc34896c8f1325925cb017c70bb23eac704 (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 4da106ba69c8574366887a32c9e699f9b7410499
Author: radhika <radhika at curoverse.com>
Date:   Thu Aug 18 14:22:59 2016 -0400

    9684: update arvados_model -> recursive_stringify to convert ":foo" to "foo"

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index a942b57..3c79f02 100644
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -398,7 +398,7 @@ class ArvadosModel < ActiveRecord::Base
       end
       false
     else
-      (x.class == Symbol) or (x.class == String and x.start_with?(':'))
+      (x.class == Symbol) or (x.class == String and x.start_with?(':') and !x.start_with?('::'))
     end
   end
 
@@ -414,7 +414,7 @@ class ArvadosModel < ActiveRecord::Base
     elsif x.is_a? Symbol
       x.to_s
     else
-      if x.is_a? String and x.start_with?(':')
+      if x.is_a? String and x.start_with?(':') and !x.start_with?('::')
         x[1..-1]
       else
         x

commit f90267f98880d40c3038391561c5435e531b0722
Author: radhika <radhika at curoverse.com>
Date:   Thu Aug 18 12:47:50 2016 -0400

    9684: update arvados_model -> recursive_stringify to convert ":foo" to "foo"

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index 6cd40a4..a942b57 100644
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -398,7 +398,7 @@ class ArvadosModel < ActiveRecord::Base
       end
       false
     else
-      (x.class == Symbol)
+      (x.class == Symbol) or (x.class == String and x.start_with?(':'))
     end
   end
 
@@ -414,7 +414,11 @@ class ArvadosModel < ActiveRecord::Base
     elsif x.is_a? Symbol
       x.to_s
     else
-      x
+      if x.is_a? String and x.start_with?(':')
+        x[1..-1]
+      else
+        x
+      end
     end
   end
 
diff --git a/services/api/config/initializers/safe_yaml.rb b/services/api/config/initializers/safe_yaml.rb
deleted file mode 100644
index 760f2ad..0000000
--- a/services/api/config/initializers/safe_yaml.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'safe_yaml'
-
-SafeYAML::OPTIONS[:default_mode] = :safe
-SafeYAML::OPTIONS[:deserialize_symbols] = true

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


hooks/post-receive
--