diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-07 16:27:53 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-07 16:27:53 +0300 |
| commit | 41bc9c463c187396e47b4a942965de6ecddca5a1 (patch) | |
| tree | 620214ebf7850bdd2c9bd2424a66be6e732afcc7 /app/controllers/projects/avatars_controller.rb | |
| parent | a215e2ee8ddaefbfef16669ad0bd8ccd6853e163 (diff) | |
Refactor caching code
Diffstat (limited to 'app/controllers/projects/avatars_controller.rb')
| -rw-r--r-- | app/controllers/projects/avatars_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb index 6de7888888f..a6bebc46b06 100644 --- a/app/controllers/projects/avatars_controller.rb +++ b/app/controllers/projects/avatars_controller.rb @@ -7,8 +7,9 @@ class Projects::AvatarsController < Projects::ApplicationController @blob = @repository.blob_at_branch('master', @project.avatar_in_git) if @blob headers['X-Content-Type-Options'] = 'nosniff' - set_cache_headers - check_etag! + + return if cached_blob? + headers.store(*Gitlab::Workhorse.send_git_blob(@repository, @blob)) headers['Content-Disposition'] = 'inline' headers['Content-Type'] = safe_content_type(@blob) |