Merge branch 'rotated_profile_image' into 'master'

Check orientation of profile image See merge request gitlab-org/gitlab-ce!14461
2017-09-28 06:33:26 +00:00 · 2017-09-28 06:33:26 +00:00 · 11c8b8bc3c
parent 3d27d157ed d2f96827b0
commit 11c8b8bc3c
2 changed files with 7 additions and 1 deletions
--- 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
@ -0,0 +1,5 @@
+---
+title: Fix profile image orientation based on EXIF data gvieira37
+merge_request: 14461
+author: gvieira37
+type: fixed