summaryrefslogtreecommitdiff
path: root/spec/controllers/profiles
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-03-15 13:20:54 +0100
committerRémy Coutable <remy@rymai.me>2016-03-15 14:55:40 +0100
commit1714883107b7b8b8f2ef8c2836acc2866362738e (patch)
tree4c79d81c52b932c20d0ddfb467175f39e281faf3 /spec/controllers/profiles
parentea7d062fa60e3e622288237fc66a815348bbcf36 (diff)
downloadgitlab-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/controllers/profiles')
-rw-r--r--spec/controllers/profiles/avatars_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/profiles/avatars_controller_spec.rb b/spec/controllers/profiles/avatars_controller_spec.rb
index 85dff009bcf..ad5855df0a4 100644
--- a/spec/controllers/profiles/avatars_controller_spec.rb
+++ b/spec/controllers/profiles/avatars_controller_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Profiles::AvatarsController do
- let(:user) { create(:user, :with_avatar) }
+ let(:user) { create(:user, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png")) }
before do
sign_in(user)