diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 21:27:43 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 21:27:43 +0000 |
| commit | 09f4af04c6672f7e2d1584f9940a3d9ff53a4a4f (patch) | |
| tree | 8a999e98a1ef46ce3366888c07bdb0498d25eb2c /app/views/projects/edit.html.haml | |
| parent | b3dc990d944222ecc60532d7306dfddd75e065a7 (diff) | |
| parent | 4664188824efd968fe870ec5f7893598e6b078f3 (diff) | |
| download | gitlab-ce-09f4af04c6672f7e2d1584f9940a3d9ff53a4a4f.tar.gz | |
Merge branch 'remove-wiki-image-border-radius' into 'master'
Update avatar container name so it doesnt conflict with other image containers
Bug from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7206 renders all wiki images circular
Before:
After:
cc @tauriedavis @dzaporozhets
See merge request !7268
Diffstat (limited to 'app/views/projects/edit.html.haml')
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index a5422966617..0aa8801c2d8 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -118,7 +118,7 @@ Project avatar .form-group - if @project.avatar? - .image-container.s160 + .avatar-container.s160 = project_icon("#{@project.namespace.to_param}/#{@project.to_param}", alt: '', class: 'avatar project-avatar s160') %p.light - if @project.avatar_in_git |