Merge branch 'better-location-for-signin-disable' into 'master'

Better location for signin disable

Make it easier for people to find these settings where they are expected, under auth settings.

config/gitlab.yml.example

@@ -49,15 +49,6 @@ production: &base
     ##   COLOR  = 5
     # default_theme: 2 # default: 2
 
-
-    ## Users management
-    # default: false - Account passwords are not sent via the email if signup is enabled.
-    # signup_enabled: true
-    #
-    # default: true - If set to false, standard login form won't be shown on the sign-in page
-    # signin_enabled: false
-
-
     # Restrict setting visibility levels for non-admin users.
     # The default is to allow all levels.
     #restricted_visibility_levels: [ "public" ]
@@ -121,6 +112,16 @@ production: &base
   # 2. Auth settings
   # ==========================
 
+  ## Users can create accounts
+  # This also allows normal users to sign up for accounts themselves
+  # default: false - By default GitLab administrators must create all new accounts
+  # signup_enabled: true
+
+  ## Standard login settings
+  # The standard login can be disabled to force login via LDAP
+  # default: true - If set to false the standard login form won't be shown on the sign-in page
+  # signin_enabled: false
+
   ## LDAP settings
   # You can inspect a sample of the LDAP users with login access by running:
   #   bundle exec rake gitlab:ldap:check RAILS_ENV=production