Commit 5dffd61d authored by Jan Provaznik's avatar Jan Provaznik

Changed order of include

parent 6467bbab
class Appearance < ActiveRecord::Base class Appearance < ActiveRecord::Base
include WithUploads
include CacheMarkdownField include CacheMarkdownField
include AfterCommitQueue include AfterCommitQueue
include ObjectStorage::BackgroundMove include ObjectStorage::BackgroundMove
include WithUploads
prepend EE::Appearance prepend EE::Appearance
......
...@@ -5,7 +5,6 @@ require 'carrierwave/orm/activerecord' ...@@ -5,7 +5,6 @@ require 'carrierwave/orm/activerecord'
class Group < Namespace class Group < Namespace
include EE::Group include EE::Group
include Gitlab::ConfigHelper include Gitlab::ConfigHelper
include WithUploads
include AfterCommitQueue include AfterCommitQueue
include AccessRequestable include AccessRequestable
include Avatarable include Avatarable
...@@ -14,6 +13,7 @@ class Group < Namespace ...@@ -14,6 +13,7 @@ class Group < Namespace
include LoadedInGroupList include LoadedInGroupList
include GroupDescendant include GroupDescendant
include TokenAuthenticatable include TokenAuthenticatable
include WithUploads
has_many :group_members, -> { where(requested_at: nil) }, dependent: :destroy, as: :source # rubocop:disable Cop/ActiveRecordDependent has_many :group_members, -> { where(requested_at: nil) }, dependent: :destroy, as: :source # rubocop:disable Cop/ActiveRecordDependent
alias_method :members, :group_members alias_method :members, :group_members
......
...@@ -4,7 +4,6 @@ class Project < ActiveRecord::Base ...@@ -4,7 +4,6 @@ class Project < ActiveRecord::Base
include Gitlab::ConfigHelper include Gitlab::ConfigHelper
include Gitlab::ShellAdapter include Gitlab::ShellAdapter
include Gitlab::VisibilityLevel include Gitlab::VisibilityLevel
include WithUploads
include AccessRequestable include AccessRequestable
include Avatarable include Avatarable
include CacheMarkdownField include CacheMarkdownField
...@@ -24,6 +23,7 @@ class Project < ActiveRecord::Base ...@@ -24,6 +23,7 @@ class Project < ActiveRecord::Base
include ::Gitlab::Utils::StrongMemoize include ::Gitlab::Utils::StrongMemoize
include ChronicDurationAttribute include ChronicDurationAttribute
include FastDestroyAll::Helpers include FastDestroyAll::Helpers
include WithUploads
# EE specific modules # EE specific modules
prepend EE::Project prepend EE::Project
......
...@@ -3,7 +3,6 @@ require 'carrierwave/orm/activerecord' ...@@ -3,7 +3,6 @@ require 'carrierwave/orm/activerecord'
class User < ActiveRecord::Base class User < ActiveRecord::Base
extend Gitlab::ConfigHelper extend Gitlab::ConfigHelper
include WithUploads
include Gitlab::ConfigHelper include Gitlab::ConfigHelper
include Gitlab::SQL::Pattern include Gitlab::SQL::Pattern
include AfterCommitQueue include AfterCommitQueue
...@@ -18,6 +17,7 @@ class User < ActiveRecord::Base ...@@ -18,6 +17,7 @@ class User < ActiveRecord::Base
include IgnorableColumn include IgnorableColumn
include BulkMemberAccessLoad include BulkMemberAccessLoad
include BlocksJsonSerialization include BlocksJsonSerialization
include WithUploads
prepend EE::User prepend EE::User
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment