aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-02-12 15:04:38 -0500
committerGitHub <noreply@github.com>2018-02-12 15:04:38 -0500
commit18b13d768fc1ecb8a209c9b1d3c1ddcfe27e3737 (patch)
tree962a073f65b6d23370ee63c084f6cdb692d80fab
parent81c7d4138a3d45458e92d97aba8eaef35906f9a9 (diff)
parent40fabc3cc1f4a00cb528ea863eb4f2f3e546d383 (diff)
downloadrails-18b13d768fc1ecb8a209c9b1d3c1ddcfe27e3737.tar.gz
rails-18b13d768fc1ecb8a209c9b1d3c1ddcfe27e3737.tar.bz2
rails-18b13d768fc1ecb8a209c9b1d3c1ddcfe27e3737.zip
Merge pull request #31968 from wojtodzio/fix-activestorage-blob-includes
ActiveStorage: use full class names when including concerns to avoid collisions
-rw-r--r--activestorage/app/models/active_storage/blob.rb4
1 files changed, 3 insertions, 1 deletions
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"