diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-07-07 20:45:27 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-07-07 20:45:27 +0000 |
| commit | a6d8c2e0c68d326e3017b875668da8d16d8d299c (patch) | |
| tree | f07882ea4e354142c60549f29eed89d160d6315f | |
| parent | c7dc35611e054a2f393ce448872e8c19c02b29c5 (diff) | |
| parent | 29fc8ef8bbd6d4d363ce4a733af753c1990c1ba6 (diff) | |
| download | gitlab-ce-a6d8c2e0c68d326e3017b875668da8d16d8d299c.tar.gz | |
Merge remote-tracking branch 'dev/13-12-stable' into 13-12-stable
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | config/initializers/premailer.rb | 3 |
4 files changed, 10 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fddf2902d72..0842a1c2170 100644 --- 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) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 73332f228d5..21edccba210 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.12.7
\ No newline at end of file +13.12.8
\ No newline at end of file @@ -1 +1 @@ -13.12.7
\ No newline at end of file +13.12.8
\ No newline at end of file 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] ) |