summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-06 18:10:41 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-06 18:10:41 +0000
commitbf03cc68a34a38776db7973328c5c6cbbdd8aeaa (patch)
tree469c40e09966ce22157d01a6b462e70ed74430de /config
parentf53d20d4fc9f879d06f6834a79963e1e787ed107 (diff)
downloadgitlab-ce-bf03cc68a34a38776db7973328c5c6cbbdd8aeaa.tar.gz
Add latest changes from gitlab-org/security/gitlab@14-0-stable-ee
Diffstat (limited to 'config')
-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]
)