diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb index e7fe0bff5b83b368a0e1dc4a559f6fa5ca67a844..8802f58e31c09b10a8b1d1bfbc347eb599fe8e3b 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 fe0bff513087e3468744758de9d518cfb60ff14e..ddfa81c0b5d69dc0fd62048b9b87e2c64d868d58 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'))