Merge branch 'master' into 'master'

Fix permissions for nginx proxy_cache directory

I found that I needed to update the permissions manually on the nginx/proxy_cache directory after recreating the container. This wasn't part of the update-permissions script.

See merge request !963

docker/assets/update-permissions

@@ -31,6 +31,7 @@ fi
 # Fix nginx buffering directory permission
 if id -u gitlab-www; then
 	chown -R gitlab-www:gitlab-www /var/opt/gitlab/nginx/*_temp
+	chown -R gitlab-www:gitlab-www /var/opt/gitlab/nginx/*_cache
 fi
 
 # Fix database storage