Merge remote-tracking branch 'dev/13-12-stable' into 13-12-stable

a6d8c2e0 · GitLab Release Tools Bot · c7dc3561 · 29fc8ef8 · a6d8c2e0 · a6d8c2e0
Commit a6d8c2e0 authored Jul 07, 2021 by GitLab Release Tools Bot
Showing with 10 additions and 3 deletions

CHANGELOG.md CHANGELOG.md +6 -0

GITALY_SERVER_VERSION GITALY_SERVER_VERSION +1 -1

VERSION VERSION +1 -1

config/initializers/premailer.rb config/initializers/premailer.rb +2 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.

+## 13.12.8 (2021-07-07)
+
+### Security (1 change)
+
+- [Disable file and network premailer strategies](gitlab-org/security/gitlab@ee69d6d6950bb116cb31523ca805e78af431c25c) ([merge request](gitlab-org/security/gitlab!1545))
+
 ## 13.12.7 (2021-07-05)

 ### Fixed (2 changes)

--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-13.12.7
\ No newline at end of file
+13.12.8
\ No newline at end of file
--- a/VERSION
+++ b/VERSION
-13.12.7
\ No newline at end of file
+13.12.8
\ No newline at end of file
--- 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]
 )