diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-27 15:17:06 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-27 15:17:06 +0300 |
| commit | ec1055076c400a579d87fe970da342617efd4f94 (patch) | |
| tree | bb331e0a8d725156541fe9f33225d1db5947268e /lib/gitlab/auth.rb | |
| parent | 01d8c7d6dd27410c41447c867e96d6587f17572f (diff) | |
| parent | 22279bc55870435c61d5e8208cc3117ef2268052 (diff) | |
| download | gitlab-ce-ec1055076c400a579d87fe970da342617efd4f94.tar.gz | |
Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team
Conflicts:
config/gitlab.yml.example
Diffstat (limited to 'lib/gitlab/auth.rb')
| -rw-r--r-- | lib/gitlab/auth.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index ff1d1b13cc9..beb4fcf0570 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -39,8 +39,7 @@ module Gitlab email: email, password: password, password_confirmation: password, - projects_limit: Gitlab.config.gitlab.default_projects_limit, - }, as: :admin) + }, as: :admin).with_defaults @user.save! if Gitlab.config.omniauth['block_auto_created_users'] && !ldap |