summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuilherme Vieira <guilherme@flipstudio.net>2017-09-22 22:26:00 -0300
committerGuilherme Vieira <guilherme@flipstudio.net>2017-09-27 14:55:15 +0000
commitd2f96827b098bebedc41f0d4be86e44fd2ef3a56 (patch)
treea95fbbbecd70578fb9b5146acdb2b03c12383b78
parent024d10b7adabe4ca2fc42107837367cb086fe75c (diff)
downloadgitlab-ce-d2f96827b098bebedc41f0d4be86e44fd2ef3a56.tar.gz
Check orientation of profile image
-rw-r--r--app/assets/javascripts/profile/gl_crop.js3
-rw-r--r--changelogs/unreleased/rotated_profile_image.yml5
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