From ee05872759daf5973905fb4434cc3b1b0584d88b Mon Sep 17 00:00:00 2001 From: Xurxo Date: Wed, 15 Mar 2017 15:02:48 +0000 Subject: [PATCH] Remove whitespace in group links --- app/views/shared/groups/_group.html.haml | 7 ++----- changelogs/unreleased/issue_29449.yml | 4 ++++ 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 changelogs/unreleased/issue_29449.yml diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index 60ca23ef680..a95020a9be8 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -1,5 +1,6 @@ - group_member = local_assigns[:group_member] - full_name = true unless local_assigns[:full_name] == false +- group_name = full_name ? group.full_name : group.name - css_class = '' unless local_assigns[:css_class] - css_class += " no-description" if group.description.blank? @@ -28,11 +29,7 @@ .avatar-container.s40 = image_tag group_icon(group), class: "avatar s40 hidden-xs" .title - = link_to group, class: 'group-name' do - - if full_name - = group.full_name - - else - = group.name + = link_to group_name, group, class: 'group-name' - if group_member as diff --git a/changelogs/unreleased/issue_29449.yml b/changelogs/unreleased/issue_29449.yml new file mode 100644 index 00000000000..3556f22b080 --- /dev/null +++ b/changelogs/unreleased/issue_29449.yml @@ -0,0 +1,4 @@ +--- +title: Remove whitespace in group links +merge_request: 9947 +author: Xurxo Méndez Pérez