diff options
author | Rémy Coutable <remy@rymai.me> | 2016-03-15 15:53:42 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-15 15:53:42 +0000 |
commit | 5c1f6f8cfcc30597ca3f9bea8ab4431049ed1bd6 (patch) | |
tree | db674a9f4c5e992e6d69cf22af9003af08a1da3f /app/views | |
parent | bbfe15491e496bad0b532b9607d3b380c98206c9 (diff) | |
parent | 1714883107b7b8b8f2ef8c2836acc2866362738e (diff) | |
download | gitlab-ce-5c1f6f8cfcc30597ca3f9bea8ab4431049ed1bd6.tar.gz |
Merge branch 'revert-avatar-cropping' into 'master'
Revert the avatar cropping feature
Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping
See merge request !3223
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/profiles/show.html.haml | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 3d1ba49491c..cd582ba7060 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -1,7 +1,4 @@ = form_for @user, url: profile_path, method: :put, html: { multipart: true, class: "edit-user prepend-top-default" }, authenticity_token: true do |f| - = f.hidden_field :avatar_crop_x - = f.hidden_field :avatar_crop_y - = f.hidden_field :avatar_crop_size -if @user.errors.any? %div.alert.alert-danger %ul @@ -97,19 +94,3 @@ .prepend-top-default.append-bottom-default = f.submit 'Update profile settings', class: "btn btn-success" = link_to "Cancel", user_path(current_user), class: "btn btn-cancel" - -.modal.modal-profile-crop - .modal-dialog - .modal-content - .modal-header - %button.close{type: 'button', data: {dismiss: 'modal'}} - %span - × - %h4.modal-title - Crop your new profile picture - .modal-body - %p - %img.modal-profile-crop-image - .modal-footer - %button.btn.btn-primary.js-upload-user-avatar{:type => "button"} - Set new profile picture |