diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-28 06:33:26 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-28 06:33:26 +0000 |
| commit | 11c8b8bc3c2294ef2e3a33196619f6e61f1e8d82 (patch) | |
| tree | 3ad7a42fb5b449d8c9edddee3b3bf22057eb429d | |
| parent | 3d27d157ed1e2e13056b97862cfe8242ea6e5a1f (diff) | |
| parent | d2f96827b098bebedc41f0d4be86e44fd2ef3a56 (diff) | |
| download | gitlab-ce-11c8b8bc3c2294ef2e3a33196619f6e61f1e8d82.tar.gz | |
Merge branch 'rotated_profile_image' into 'master'
Check orientation of profile image
See merge request gitlab-org/gitlab-ce!14461
| -rw-r--r-- | app/assets/javascripts/profile/gl_crop.js | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/rotated_profile_image.yml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/profile/gl_crop.js b/app/assets/javascripts/profile/gl_crop.js index 291ae24aa68..4bdda611cfc 100644 --- a/app/assets/javascripts/profile/gl_crop.js +++ b/app/assets/javascripts/profile/gl_crop.js @@ -73,7 +73,8 @@ import _ from 'underscore'; aspectRatio: 1, modal: true, scalable: false, - rotatable: false, + rotatable: true, + checkOrientation: true, zoomable: true, dragMode: 'move', guides: false, diff --git a/changelogs/unreleased/rotated_profile_image.yml b/changelogs/unreleased/rotated_profile_image.yml new file mode 100644 index 00000000000..1e221e47379 --- /dev/null +++ b/changelogs/unreleased/rotated_profile_image.yml @@ -0,0 +1,5 @@ +--- +title: Fix profile image orientation based on EXIF data gvieira37 +merge_request: 14461 +author: gvieira37 +type: fixed |