summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gitlab/favicon.rb2
-rw-r--r--spec/lib/gitlab/favicon_spec.rb2
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'))