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/groups/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:
![Screen_Shot_2016-11-03_at_9.27.45_AM](/uploads/f49baa4481cec6d6c043087aa1a83d09/Screen_Shot_2016-11-03_at_9.27.45_AM.png)
After:
![Screen_Shot_2016-11-03_at_9.27.37_AM](/uploads/5b21d1752b5fa5adcabd44b8973fb55d/Screen_Shot_2016-11-03_at_9.27.37_AM.png)
cc @tauriedavis @dzaporozhets
See merge request !7268
Diffstat (limited to 'app/views/groups/edit.html.haml')
-rw-r--r-- | app/views/groups/edit.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 2f90c19d4b4..2706e8692d1 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -8,7 +8,7 @@ .form-group .col-sm-offset-2.col-sm-10 - .image-container.s160 + .avatar-container.s160 = image_tag group_icon(@group), alt: '', class: 'avatar group-avatar s160' %p.light - if @group.avatar? |