diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 16:36:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 16:36:03 +0300 |
| commit | 39b0e286bcf1239424eed8e0dac118a9f4f4b6ac (patch) | |
| tree | 3cee07417e86b487913af6dd0d2084da31fa3f1c /app/controllers | |
| parent | 9fc4650da6efa808960b28f9e77fede55424d77e (diff) | |
Add latest changes from gitlab-org/gitlab@12-4-stable-ee
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/uploads_actions.rb | 2 |
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 |