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/controllers | |
| 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/controllers')
| -rw-r--r-- | app/controllers/profiles_controller.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index 50b8f38eecb..32fca6b838e 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -58,9 +58,6 @@ class ProfilesController < Profiles::ApplicationController def user_params params.require(:user).permit( - :avatar_crop_x, - :avatar_crop_y, - :avatar_crop_size, :avatar, :bio, :email, |