diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-09-28 10:45:50 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2018-06-05 16:20:21 +0200 |
| commit | 40ffa8401b96dda5f67ea699dbcca0ff64263810 (patch) | |
| tree | bb243de568a356660a298588426a431a5c8a8659 | |
| parent | 85a8e6f26a8fa0ea9f430f0094fb14706bfd2991 (diff) | |
| download | gitlab-ce-40ffa8401b96dda5f67ea699dbcca0ff64263810.tar.gz | |
add request store caching to favicon
| -rw-r--r-- | lib/gitlab/favicon.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/favicon_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb index e7fe0bff5b8..8802f58e31c 100644 --- a/lib/gitlab/favicon.rb +++ b/lib/gitlab/favicon.rb @@ -24,7 +24,7 @@ module Gitlab private def appearance - Appearance.current || Appearance.new + RequestStore.store[:appearance] ||= (Appearance.current || Appearance.new) end def appearance_favicon diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb index fe0bff51308..ddfa81c0b5d 100644 --- a/spec/lib/gitlab/favicon_spec.rb +++ b/spec/lib/gitlab/favicon_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe Gitlab::Favicon do +RSpec.describe Gitlab::Favicon, :request_store do describe '.default' do it 'defaults to favicon.ico' do allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production')) |