diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-15 13:20:54 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-15 14:55:40 +0100 |
| commit | 1714883107b7b8b8f2ef8c2836acc2866362738e (patch) | |
| tree | 4c79d81c52b932c20d0ddfb467175f39e281faf3 /spec/factories/users.rb | |
| parent | ea7d062fa60e3e622288237fc66a815348bbcf36 (diff) | |
| download | gitlab-ce-1714883107b7b8b8f2ef8c2836acc2866362738e.tar.gz | |
Revert "Merge branch 'avatar-cropping' into 'master'
"revert-avatar-cropping
This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing
changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
Diffstat (limited to 'spec/factories/users.rb')
| -rw-r--r-- | spec/factories/users.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 785c2a3d811..a5c60c51c5b 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -23,13 +23,6 @@ FactoryGirl.define do end end - trait :with_avatar do - avatar { fixture_file_upload(Rails.root.join(*%w(spec fixtures dk.png)), 'image/png') } - avatar_crop_x 0 - avatar_crop_y 0 - avatar_crop_size 256 - end - factory :omniauth_user do transient do extern_uid '123456' |