summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-02-06 15:38:08 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-02-06 16:17:46 -0600
commit426680def4bdeb7c6b37d8a0538fc73c39942495 (patch)
tree573425c39c4391f1c533801bcf9cbecfe3a4e740 /app/models/user.rb
parent54ff60f7064b4287ce3727c9a6f373a77b03ef5f (diff)
downloadgitlab-ce-426680def4bdeb7c6b37d8a0538fc73c39942495.tar.gz
Backport of the frontend view, including tests
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 54f5388eb2c..79c83f7bcf4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -903,6 +903,21 @@ class User < ActiveRecord::Base
end
end
+ def access_level
+ if admin?
+ :admin
+ else
+ :regular
+ end
+ end
+
+ def access_level=(new_level)
+ new_level = new_level.to_s
+ return unless %w(admin regular).include?(new_level)
+
+ self.admin = (new_level == 'admin')
+ end
+
private
def ci_projects_union