diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-07-07 20:36:57 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-07-07 20:36:57 +0000 |
| commit | 0fabe9336cf7cf2a31156931e716e84fc45e842f (patch) | |
| tree | 326752bc8f52f2d2e4b990795aa3fc11eae4cbc1 | |
| parent | f53d20d4fc9f879d06f6834a79963e1e787ed107 (diff) | |
| parent | 7fd059d6f16ac5af6572303dd21f3c0eca61ad43 (diff) | |
| download | gitlab-ce-0fabe9336cf7cf2a31156931e716e84fc45e842f.tar.gz | |
Merge remote-tracking branch 'dev/14-0-stable' into 14-0-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 f47dc60d456..528f8455efe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 14.0.4 (2021-07-07) + +### Security (1 change) + +- [Disable file and network premailer strategies](gitlab-org/security/gitlab@4af58e3d8ee1b25048f34208db6e685cf0bf1411) ([merge request](gitlab-org/security/gitlab!1544)) + ## 14.0.3 (2021-07-06) ### Fixed (7 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 3b0c3fb7919..25f846fc802 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -14.0.3
\ No newline at end of file +14.0.4
\ No newline at end of file @@ -1 +1 @@ -14.0.3
\ No newline at end of file +14.0.4
\ 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] ) |