Commit 28b0b4dd authored by Michael Kozono's avatar Michael Kozono

Merge branch 'sh-fix-issue-36201' into 'master'

Fix CSS loading errors in e-mail notifications

Closes #36201

See merge request gitlab-org/gitlab!20047
parents 7b06d27f 846ef72b
...@@ -329,7 +329,7 @@ module ApplicationHelper ...@@ -329,7 +329,7 @@ module ApplicationHelper
if Rails.configuration.assets.compile if Rails.configuration.assets.compile
app.assets.find_asset(name).to_s app.assets.find_asset(name).to_s
else else
controller.view_context.render(file: File.join('public/assets', app.assets_manifest.assets[name])) controller.view_context.render(file: Rails.root.join('public/assets', app.assets_manifest.assets[name]).to_s)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment