diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-05-07 15:49:32 +0200 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-05-16 08:58:07 +0200 |
| commit | 32e22468300e3a52c82a855a01fc3983473107e0 (patch) | |
| tree | bedc55c548a0083183c346efbc5f7d6809af1f48 | |
| parent | c81a37c1d3f864cf0a00386dab29da78f222e3a5 (diff) | |
| download | gitlab-ce-32e22468300e3a52c82a855a01fc3983473107e0.tar.gz | |
Changed order of include
| -rw-r--r-- | app/models/appearance.rb | 2 | ||||
| -rw-r--r-- | app/models/group.rb | 2 | ||||
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/models/appearance.rb b/app/models/appearance.rb index f3cfc8ccd1e..f8713138a93 100644 --- a/app/models/appearance.rb +++ b/app/models/appearance.rb @@ -1,8 +1,8 @@ class Appearance < ActiveRecord::Base - include WithUploads include CacheMarkdownField include AfterCommitQueue include ObjectStorage::BackgroundMove + include WithUploads cache_markdown_field :description cache_markdown_field :new_project_guidelines diff --git a/app/models/group.rb b/app/models/group.rb index 107711e3cc5..8fb77a7869d 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -2,7 +2,6 @@ require 'carrierwave/orm/activerecord' class Group < Namespace include Gitlab::ConfigHelper - include WithUploads include AfterCommitQueue include AccessRequestable include Avatarable @@ -11,6 +10,7 @@ class Group < Namespace include LoadedInGroupList include GroupDescendant include TokenAuthenticatable + include WithUploads has_many :group_members, -> { where(requested_at: nil) }, dependent: :destroy, as: :source # rubocop:disable Cop/ActiveRecordDependent alias_method :members, :group_members diff --git a/app/models/project.rb b/app/models/project.rb index 0b0d653c4af..0975e64e995 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -4,7 +4,6 @@ class Project < ActiveRecord::Base include Gitlab::ConfigHelper include Gitlab::ShellAdapter include Gitlab::VisibilityLevel - include WithUploads include AccessRequestable include Avatarable include CacheMarkdownField @@ -24,6 +23,7 @@ class Project < ActiveRecord::Base include ::Gitlab::Utils::StrongMemoize include ChronicDurationAttribute include FastDestroyAll::Helpers + include WithUploads extend Gitlab::ConfigHelper diff --git a/app/models/user.rb b/app/models/user.rb index 082ec76e86a..b90f5471071 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,7 +3,6 @@ require 'carrierwave/orm/activerecord' class User < ActiveRecord::Base extend Gitlab::ConfigHelper - include WithUploads include Gitlab::ConfigHelper include Gitlab::SQL::Pattern include AfterCommitQueue @@ -18,6 +17,7 @@ class User < ActiveRecord::Base include IgnorableColumn include BulkMemberAccessLoad include BlocksJsonSerialization + include WithUploads DEFAULT_NOTIFICATION_LEVEL = :participating |