Merge remote-tracking branch 'upstream/pull/3410'

[rails.git] / app / models / relation.rb

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 365ea533e11259aa3f9ae9ebc495cb990b400c10..a231feddb7fe45427ab5039a1b453e6adce393f6 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -22,7 +22,6 @@ class Relation < ApplicationRecord
 
   include ConsistencyValidations
   include NotRedactable
-  include ObjectMetadata
 
   self.table_name = "current_relations"
 
@@ -131,7 +130,7 @@ class Relation < ApplicationRecord
   end
 
   def tags
-    @tags ||= relation_tags.collect { |t| [t.k, t.v] }.to_h
+    @tags ||= relation_tags.to_h { |t| [t.k, t.v] }
   end
 
   attr_writer :members, :tags