summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-21 20:04:35 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-21 20:04:35 +0000
commit8a66a10c2a13463e5889bb1503bc84a300b13f6a (patch)
tree0bc2878ddca51674ac165f0de9c12b785cfd12cc /spec
parent2395b8f079fdd3f82428fd6f71221f57614cd226 (diff)
parent6bf58e76bd9b74239b668f09c1c38e89d5e53f11 (diff)
downloadgitlab-ce-8a66a10c2a13463e5889bb1503bc84a300b13f6a.tar.gz
Merge branch 'fix_avatar_url' into 'master'
Remove unnecessary / from avatar url ## What does this MR do? This MR removes the unecessary / from the avatar url. ## What Use Case does this MR solve? The // in the url cold lead to avatars not being displayed (reported on IRC) With this MR the avatar url changes from http://localhost:3000//uploads/user/avatar/1/gitlab_logo.png to http://localhost:3000/uploads/user/avatar/1/gitlab_logo.png @dblessing Can you take a look? See merge request !303
Diffstat (limited to 'spec')
-rw-r--r--spec/helpers/application_helper_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 9cdbc846b19..1738f3443cf 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -73,7 +73,7 @@ describe ApplicationHelper do
user = create(:user)
user.avatar = File.open(avatar_file_path)
user.save!
- avatar_icon(user.email).to_s.should match("/gitlab//uploads/user/avatar/#{ user.id }/gitlab_logo.png")
+ avatar_icon(user.email).to_s.should match("/gitlab/uploads/user/avatar/#{ user.id }/gitlab_logo.png")
end
it "should call gravatar_icon when no avatar is present" do