diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-26 17:56:24 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-26 17:56:24 +0000 |
| commit | 01160fc06182de89c400af174861f6545ad6ceb8 (patch) | |
| tree | d277965326221f36d4c04cff537c3205699bc15f /app/assets/stylesheets/application.scss | |
| parent | 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282 (diff) | |
| parent | dead4f29067411007affe7381e9f3ab13cc60306 (diff) | |
| download | gitlab-ce-01160fc06182de89c400af174861f6545ad6ceb8.tar.gz | |
Merge branch 'avatar-cropping' into 'master'
Fix avatar stretching by providing a cropping feature
Originally by @nesk at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2773
Fixes #7959
See merge request !2951
Diffstat (limited to 'app/assets/stylesheets/application.scss')
| -rw-r--r-- | app/assets/stylesheets/application.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 0c0451fe4dd..f51054f13dc 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -9,6 +9,7 @@ *= require_self *= require dropzone/basic *= require cal-heatmap + *= require cropper.css */ /* |