gitlab: Merge in upstream config updates

    This does almost only pure merge. We will slaposify / adjust config
    and corresponding md5sum in the following patches.

Conflicts:
	software/gitlab/template/gitlab.yml.in
	software/gitlab/template/nginx.conf.in

software/gitlab/template/gitlab.yml.in

@@ -198,6 +198,16 @@ production: &base
     # Flag stuck CI builds as failed
     stuck_ci_builds_worker:
       cron: <%= @stuck_ci_builds_worker_cron %>
+    # Remove expired build artifacts
+    expire_build_artifacts_worker:
+      cron: <%= @expire_build_artifacts_worker_cron %>
+    # Periodically run 'git fsck' on all repositories. If started more than
+    # once per hour you will have concurrent 'git fsck' jobs.
+    repository_check_worker:
+      cron: <%= @repository_check_worker_cron %>
+    # Send admin emails once a week
+    admin_email_worker:
+      cron: <%= @admin_email_worker_cron %>
 
     # Remove outdated repository archives
     repository_archive_cache_worker:
@@ -464,8 +474,8 @@ production: &base
     #}
 
     {# we are ok (for now) with default rack-attack git settings
-    rack_attack:
-      git_basic_auth: <%= @rack_attack_git_basic_auth.to_json if @rack_attack_git_basic_auth %>
+  rack_attack:
+    git_basic_auth: <%= @rack_attack_git_basic_auth.to_json if @rack_attack_git_basic_auth %>
     #}
 
 

software/gitlab/template/nginx.conf.in

@@ -27,6 +27,8 @@ http {
   log_format gitlab_mattermost_access '<%= @gitlab_mattermost_access_log_format %>';
   #}
 
+  server_names_hash_bucket_size <%= @server_names_hash_bucket_size %>;
+
   sendfile    {{ cfg('nginx_sendfile') }};
   tcp_nopush  {{ cfg('nginx_tcp_nopush') }};
   tcp_nodelay {{ cfg('nginx_tcp_nodelay') }};

software/gitlab/template/smtp_settings.rb.in

@@ -10,6 +10,7 @@
 if Rails.env.production?
   Gitlab::Application.config.action_mailer.delivery_method = :smtp
 
+  ActionMailer::Base.delivery_method = :smtp
   ActionMailer::Base.smtp_settings = {
     address:                "{{ cfg('smtp_address') }}",
     port:                   {{ cfg('smtp_port') }},