From 40fabc3cc1f4a00cb528ea863eb4f2f3e546d383 Mon Sep 17 00:00:00 2001
From: Wojtek Wrona <wojtodzio@gmail.com>
Date: Mon, 12 Feb 2018 16:36:34 +0100
Subject: Use full class names when including concerns to avoid collisions

---
 activestorage/app/models/active_storage/blob.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/activestorage/app/models/active_storage/blob.rb b/activestorage/app/models/active_storage/blob.rb
index a1e69e2264..bca9f4c590 100644
--- a/activestorage/app/models/active_storage/blob.rb
+++ b/activestorage/app/models/active_storage/blob.rb
@@ -14,7 +14,9 @@
 # update a blob's metadata on a subsequent pass, but you should not update the key or change the uploaded file.
 # If you need to create a derivative or otherwise change the blob, simply create a new blob and purge the old one.
 class ActiveStorage::Blob < ActiveRecord::Base
-  include Analyzable, Identifiable, Representable
+  include ActiveStorage::Blob::Analyzable
+  include ActiveStorage::Blob::Identifiable
+  include ActiveStorage::Blob::Representable
 
   self.table_name = "active_storage_blobs"
 
-- 
cgit v1.2.3