diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-21 15:56:29 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-21 15:56:29 -0800 |
| commit | 45bebd76d639e72aeb5b415a1f801659d8df8607 (patch) | |
| tree | 3904b46c1c557396327bfc3d6b808c358f435b32 /spec | |
| parent | 6a1aa4763aa47c32ba6bd97e77d2bc0409dfdd6f (diff) | |
| parent | 8a66a10c2a13463e5889bb1503bc84a300b13f6a (diff) | |
| download | gitlab-ce-45bebd76d639e72aeb5b415a1f801659d8df8607.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/helpers/application_helper_spec.rb | 2 |
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 |