Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
32e22468
Commit
32e22468
authored
May 07, 2018
by
Jan Provaznik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed order of include
parent
c81a37c1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/models/appearance.rb
app/models/appearance.rb
+1
-1
app/models/group.rb
app/models/group.rb
+1
-1
app/models/project.rb
app/models/project.rb
+1
-1
app/models/user.rb
app/models/user.rb
+1
-1
No files found.
app/models/appearance.rb
View file @
32e22468
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
cache_markdown_field
:description
cache_markdown_field
:description
cache_markdown_field
:new_project_guidelines
cache_markdown_field
:new_project_guidelines
...
...
app/models/group.rb
View file @
32e22468
...
@@ -2,7 +2,6 @@ require 'carrierwave/orm/activerecord'
...
@@ -2,7 +2,6 @@ require 'carrierwave/orm/activerecord'
class
Group
<
Namespace
class
Group
<
Namespace
include
Gitlab
::
ConfigHelper
include
Gitlab
::
ConfigHelper
include
WithUploads
include
AfterCommitQueue
include
AfterCommitQueue
include
AccessRequestable
include
AccessRequestable
include
Avatarable
include
Avatarable
...
@@ -11,6 +10,7 @@ class Group < Namespace
...
@@ -11,6 +10,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
...
...
app/models/project.rb
View file @
32e22468
...
@@ -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
extend
Gitlab
::
ConfigHelper
extend
Gitlab
::
ConfigHelper
...
...
app/models/user.rb
View file @
32e22468
...
@@ -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
DEFAULT_NOTIFICATION_LEVEL
=
:participating
DEFAULT_NOTIFICATION_LEVEL
=
:participating
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment