diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-17 14:15:38 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-17 14:15:38 +0000 |
| commit | 21af7459ab6f3049a98cfdaa6dda8dc2336098d8 (patch) | |
| tree | b596f459936c00f12fbdc8e50dcf9febdd80391e /app/controllers | |
| parent | cf2e3ff6f985c1ffdab9b795d79f792d3ea115fa (diff) | |
| parent | 956e914307029dbfbdb387fd6c0749dd50935fa4 (diff) | |
| download | gitlab-ce-21af7459ab6f3049a98cfdaa6dda8dc2336098d8.tar.gz | |
Merge branch '4009-external-users' into 'master'
External Users
The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users)
See merge request !3171
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 3063d299b1a..9abf08d0e19 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -150,7 +150,7 @@ class Admin::UsersController < Admin::ApplicationController :email, :remember_me, :bio, :name, :username, :skype, :linkedin, :twitter, :website_url, :color_scheme_id, :theme_id, :force_random_password, :extern_uid, :provider, :password_expires_at, :avatar, :hide_no_ssh_key, :hide_no_password, - :projects_limit, :can_create_group, :admin, :key_id + :projects_limit, :can_create_group, :admin, :key_id, :external ) end |