Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlab...

Conflicts:
	config/gitlab.yml.example

diff --cc app/models/user.rb
Simple merge

diff --cc config/gitlab.yml.example
index 4135601,1910d76..e5fac33
--- 1/config/gitlab.yml.example
--- 2/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@@ -32,12 -32,12 +32,14 @@@ production: &bas
      # Email address of your support contact (default: same as email_from)
      support_email: support@localhost
  
--    ## Project settings
++    ## User settings
      default_projects_limit: 10
 -    # signup_enabled: true             # default: false - Account passwords are not sent via the email if signup is enabled.
+     # default_can_create_group: false  # default: true
+     # default_can_create_team: false   # default: true
-     # username_changing_enabled: false # default: true - User can change her username/namespace
+     # username_changing_enabled: false # default: true - User can change her username/namespace
 +    
 +    ## Users management
 +    # signup_enabled: true          # default: false - Account passwords are not sent via the email if signup is enabled.
  
      ## Default project features settings
      default_projects_features:

diff --cc lib/gitlab/auth.rb
Simple merge