diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-28 12:20:31 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-28 12:20:31 +0000 |
| commit | d05b9fcfb4c7dc8de20ef51c31af7ff72ba4fce7 (patch) | |
| tree | b776e6840b709c9b179fb55bffb0b2f66a31371e | |
| parent | 003498e4a2040442d9d2fbbc3bd3631be74d1c65 (diff) | |
| parent | 464c26d70f74efcb2da3445f95337f394dbea00b (diff) | |
| download | gitlab-ce-d05b9fcfb4c7dc8de20ef51c31af7ff72ba4fce7.tar.gz | |
Merge branch 'security-exif-fix-orientation-11-9' into '11-9-stable'
Preserve Orientation when removing EXIF
See merge request gitlab/gitlabhq!3048
| -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 |