gitlab: Merge in upstream config updates

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

(*) condition on smtp_authentication was applied by hand on smtp_settings.rb.in

software/gitlab/template/gitlab.yml.in

@@ -86,6 +86,7 @@ production: &base
       wiki:             {{ cfg('default_projects_features.wiki') }}
       snippets:         {{ cfg('default_projects_features.snippets') }}
       builds: false {# builds not supported yet <%= @gitlab_default_projects_features_builds %> #}
+      container_registry: <%= @gitlab_default_projects_features_container_registry %>
 
     ## Webhook settings
     # Number of seconds to wait for HTTP response after sending webhook HTTP POST request (default: 10)
@@ -145,6 +146,16 @@ production: &base
     storage_path: <%= @lfs_storage_path %>
   #}
 
+  ## Container Registry
+  registry:
+    enabled: <%= @registry_enabled %>
+    host: <%= @registry_host %>
+    port: <%= @registry_port %>
+    api_url: <%= @registry_api_url %> # internal address to the registry, will be used by GitLab to directly communicate with API
+    path: <%= @registry_path %>
+    key: <%= @registry_key_path %>
+    issuer: <%= @registry_issuer %>
+
   {# we do not support Pages
   ## GitLab Pages (EE only)
   pages:

software/gitlab/template/nginx.conf.in

@@ -55,4 +55,8 @@ http {
   include <%= @gitlab_pages_http_config %>;
   include <%= @gitlab_mattermost_http_config %>
   #}
+  <% if @gitlab_registry_http_config %>
+  include <%= @gitlab_registry_http_config %>;
+  <% end %>
+
 }

software/gitlab/template/rack_attack.rb.in

@@ -24,8 +24,9 @@ paths_to_be_protected = [
 # Create one big regular expression that matches strings starting with any of
 # the paths_to_be_protected.
 paths_regex = Regexp.union(paths_to_be_protected.map { |path| /\A#{Regexp.escape(path)}/ })
+rack_attack_enabled = Gitlab.config.rack_attack.git_basic_auth['enabled']
 
-unless Rails.env.test?
+unless Rails.env.test? || !rack_attack_enabled
   Rack::Attack.throttle('protected paths', limit: {{ cfg('rate_limit_requests_per_period') }}, period: {{ cfg('rate_limit_period') }}.seconds) do |req|
     if req.post? && req.path =~ paths_regex
       req.ip

software/gitlab/template/smtp_settings.rb.in

@@ -16,7 +16,9 @@ if Rails.env.production?
     user_name:              "{{ cfg('smtp_user_name') }}",
     password:               "{{ cfg('smtp_password') }}",
     domain:                 "{{ cfg('smtp_domain') }}",
+    <% unless @smtp_authentication.nil? %>
     authentication:         :{{ cfg('smtp_authentication') }},
+    <% end %>
     enable_starttls_auto:   {{ cfg('smtp_enable_starttls_auto') }},
     # ssl:
     openssl_verify_mode:    '{{ cfg("smtp_openssl_verify_mode") }}'