Merge branch 'rotated_profile_image' into 'master'

Check orientation of profile image See merge request gitlab-org/gitlab-ce!14461

Merge branch 'rotated_profile_image' into 'master'
11c8b8bc · Tim Zallmann · 3d27d157 · d2f96827 · 11c8b8bc · 11c8b8bc
Commit 11c8b8bc authored Sep 28, 2017 by Tim Zallmann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

gl_crop.js app/assets/javascripts/profile/gl_crop.js +2 -1

rotated_profile_image.yml changelogs/unreleased/rotated_profile_image.yml +5 -0

No files found.
--- 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,

--- a/changelogs/unreleased/rotated_profile_image.yml
+++ b/changelogs/unreleased/rotated_profile_image.yml
+---
+title: Fix profile image orientation based on EXIF data gvieira37
+merge_request: 14461
+author: gvieira37
+type: fixed