summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-01 15:06:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-01 15:06:21 +0000
commitded8ee5a09a1a02209adf179ac7d6e456703726a (patch)
treec56a789ac38644cb2982f3c2a8277f1e540f5913 /app
parentdeed6022efe0149d88c57ef1df736c83465643f9 (diff)
downloadgitlab-ce-ded8ee5a09a1a02209adf179ac7d6e456703726a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r--app/controllers/concerns/uploads_actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb
index 6d9ee39f841..b87779c22d3 100644
--- a/app/controllers/concerns/uploads_actions.rb
+++ b/app/controllers/concerns/uploads_actions.rb
@@ -34,7 +34,7 @@ module UploadsActions
headers['Pragma'] = ''
ttl, directives = *cache_settings
- ttl ||= 6.months
+ ttl ||= 0
directives ||= { private: true, must_revalidate: true }
expires_in ttl, directives