Merge branch 'add_delete_option_for_registry' into 'master'

Add registry storage delete option

Fixes #1292

See merge request !781

files/gitlab-config-template/gitlab.rb.template

@@ -334,6 +334,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # registry['log_directory'] = "/var/log/gitlab/registry"
 # registry['log_level'] = "info"
 # registry['rootcertbundle'] = "/var/opt/gitlab/registry/certificate.crt"
+# registry['storage_delete_enabled'] = true
 ####################
 # GitLab Workhorse #

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -442,8 +442,7 @@ default['gitlab']['registry']['dir'] = "/var/opt/gitlab/registry"
 default['gitlab']['registry']['log_directory'] = "/var/log/gitlab/registry"
 default['gitlab']['registry']['log_level'] = "info"
 default['gitlab']['registry']['rootcertbundle'] = nil
-
-
+default['gitlab']['registry']['storage_delete_enabled'] = true
 ####
 # Nginx

files/gitlab-cookbooks/gitlab/templates/default/registry-config.yml.erb

@@ -9,6 +9,8 @@ storage:
     blobdescriptor: inmemory
   filesystem:
     rootdirectory: <%= @registry_path %>
+  delete:
+    enabled: <%= @storage_delete_enabled %>
 http:
   addr: <%= @registry_http_addr %>
   secret: "<%= @http_secret %>"