summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-06 18:11:07 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-06 18:11:07 +0000
commite518e31bc41646fdb8580fc30c6e97c6be79c632 (patch)
tree722518ce332a30eb35150fc75b167590a838cf47
parentc7dc35611e054a2f393ce448872e8c19c02b29c5 (diff)
downloadgitlab-ce-e518e31bc41646fdb8580fc30c6e97c6be79c632.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee
-rw-r--r--config/initializers/premailer.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/premailer.rb b/config/initializers/premailer.rb
index 77077888af3..b07dc792cab 100644
--- a/config/initializers/premailer.rb
+++ b/config/initializers/premailer.rb
@@ -7,5 +7,6 @@ Premailer::Rails.config.merge!(
remove_comments: true,
remove_ids: false,
remove_scripts: false,
- output_encoding: 'US-ASCII'
+ output_encoding: 'US-ASCII',
+ strategies: [:asset_pipeline]
)