diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-28 15:20:31 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-28 15:20:31 +0300 |
| commit | b894706cd5199e8025a8c2ea5db6923ee6248f93 (patch) | |
| tree | ca1db9ce381532b77105e7fba184f11b549db321 | |
| parent | e6e4859767c6ff8eccab4f6d701b99435b1ca601 (diff) | |
| parent | f847a99384d9831dcfa503c798ee34d964513ac8 (diff) | |
Merge branch 'security-exif-fix-orientation-11-8' into '11-8-stable'
Preserve Orientation when removing EXIF
See merge request gitlab/gitlabhq!3047
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 | ||||
| -rw-r--r-- | lib/gitlab/sanitizers/exif.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index 9c78b761ea1..d127a0ff9f1 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -8.3.2 +8.3.3 diff --git a/lib/gitlab/sanitizers/exif.rb b/lib/gitlab/sanitizers/exif.rb index 7427aba382f..859515d5870 100644 --- a/lib/gitlab/sanitizers/exif.rb +++ b/lib/gitlab/sanitizers/exif.rb @@ -16,6 +16,7 @@ module Gitlab ImageSize Copyright CopyrightNotice + Orientation ).freeze # these tags are common in exiftool output, these |