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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
0ed08366
Commit
0ed08366
authored
Jun 01, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move EE specific delegation to EE::User
parent
14af431a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
app/models/ee/user.rb
app/models/ee/user.rb
+3
-0
app/models/user.rb
app/models/user.rb
+0
-4
No files found.
app/models/ee/user.rb
View file @
0ed08366
...
@@ -15,6 +15,9 @@ module EE
...
@@ -15,6 +15,9 @@ module EE
# column directly.
# column directly.
validate
:auditor_requires_license_add_on
,
if: :auditor
validate
:auditor_requires_license_add_on
,
if: :auditor
validate
:cannot_be_admin_and_auditor
validate
:cannot_be_admin_and_auditor
delegate
:shared_runners_minutes_limit
,
:shared_runners_minutes_limit
=
,
to: :namespace
end
end
module
ClassMethods
module
ClassMethods
...
...
app/models/user.rb
View file @
0ed08366
...
@@ -190,10 +190,6 @@ class User < ActiveRecord::Base
...
@@ -190,10 +190,6 @@ class User < ActiveRecord::Base
delegate
:path
,
to: :namespace
,
allow_nil:
true
,
prefix:
true
delegate
:path
,
to: :namespace
,
allow_nil:
true
,
prefix:
true
# EE-only
delegate
:shared_runners_minutes_limit
,
:shared_runners_minutes_limit
=
,
to: :namespace
accepts_nested_attributes_for
:namespace
accepts_nested_attributes_for
:namespace
state_machine
:state
,
initial: :active
do
state_machine
:state
,
initial: :active
do
...
...
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