Merge branch 'cleanup-gitlab-example' into 'master'

Cleanup gitlab example

Fixes #1938

See merge request !1495

app/views/admin/application_settings/_form.html.haml

@@ -37,6 +37,7 @@
     .form-group
       = f.label :sign_in_text, class: 'control-label'
       .col-sm-10
-        = f.text_area :sign_in_text, class: 'form-control'
+        = f.text_area :sign_in_text, class: 'form-control', rows: 4
+        .help-block Markdown enabled
   .form-actions
     = f.submit 'Save', class: 'btn btn-primary'

config/gitlab.yml.example

@@ -46,8 +46,6 @@ production: &base
 
     # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
 
-    ## User settings
-    default_projects_limit: 10
     # default_can_create_group: false  # default: true
     # username_changing_enabled: false # default: true - User can change her username/namespace
     ## Default theme
@@ -58,16 +56,6 @@ production: &base
     ##   COLOR  = 5
     # default_theme: 2 # default: 2
 
-    ## Users can create accounts
-    # This also allows normal users to sign up for accounts themselves
-    # default: true - By default users can sign up themselves
-    # 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
-
     # Restrict setting visibility levels for non-admin users.
     # The default is to allow all levels.
     # restricted_visibility_levels: [ "public" ]
@@ -296,11 +284,6 @@ production: &base
     # piwik_url: '_your_piwik_url'
     # piwik_site_id: '_your_piwik_site_id'
 
-    ## Text under sign-in page (Markdown enabled)
-    # sign_in_text: |
-    #   ![Company Logo](http://www.companydomain.com/logo.png)
-    #   [Learn more about CompanyName](http://www.companydomain.com/)
-
   rack_attack:
     git_basic_auth:
       # Whitelist requests from 127.0.0.1 for web proxies (NGINX/Apache) with incorrect headers