projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2767-doc-updates
[arvados.git]
/
services
/
api
/
app
/
models
/
user.rb
diff --git
a/services/api/app/models/user.rb
b/services/api/app/models/user.rb
index 6bba194c24dac1f5460f5ce82fe90e87c202919c..8743b92b25e78c46fa8a99a41e2a3a27cdbf0e07 100644
(file)
--- a/
services/api/app/models/user.rb
+++ b/
services/api/app/models/user.rb
@@
-1,7
+1,11
@@
+require 'can_be_an_owner'
+
class User < ArvadosModel
class User < ArvadosModel
- include
Assign
Uuid
+ include
Has
Uuid
include KindAndEtag
include CommonApiTemplate
include KindAndEtag
include CommonApiTemplate
+ include CanBeAnOwner
+
serialize :prefs, Hash
has_many :api_client_authorizations
before_update :prevent_privilege_escalation
serialize :prefs, Hash
has_many :api_client_authorizations
before_update :prevent_privilege_escalation