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 | be9e4975b4bdd5d7fc1ec653ad2428c7756267d2 (patch) | |
| tree | 309dcd44ab3f1c248d65fa0d0eece4ff7d8c9870 | |
| parent | 8d2c6f01d6c01a413228d7f774a2d6459ee6882d (diff) | |
| parent | db7b5f412489e590369bd18aac67d07fc56511cd (diff) | |
| download | gitlab-ce-be9e4975b4bdd5d7fc1ec653ad2428c7756267d2.tar.gz | |
Merge branch 'security-exif-fix-orientation-11-7' into '11-7-stable'
Preserve Orientation when removing EXIF
See merge request gitlab/gitlabhq!3045
| -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 215aacb4523..50c496d20c6 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -8.0.3 +8.0.4 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 |