diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-07-07 20:54:00 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-07-07 20:54:00 +0000 |
| commit | 5dfdca52701f4dfecb484f784dca25d59e2b8cd3 (patch) | |
| tree | 9cc8fc6751b04b9048c7f40e6512be4cd89e9300 | |
| parent | efd69d1b79cb0cec67617211bcdb63190bb16e1b (diff) | |
| parent | 856079e507a1444053d2bae930215fade2cae3c8 (diff) | |
| download | gitlab-ce-13-11-stable.tar.gz | |
Merge remote-tracking branch 'dev/13-11-stable' into 13-11-stable13-11-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 34e230eef3d..514c86ac088 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.11.7 (2021-07-07) + +### Security (1 change) + +- [Disable file and network premailer strategies](gitlab-org/security/gitlab@511ed3746b48a26e95c851f76ac6fdcd44c28fd8) ([merge request](gitlab-org/security/gitlab!1546)) + ## 13.11.6 (2021-07-01) ### Added (1 change) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 660b76199a1..248623c13ac 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.11.6
\ No newline at end of file +13.11.7
\ No newline at end of file @@ -1 +1 @@ -13.11.6
\ No newline at end of file +13.11.7
\ 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] ) |