diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-15 15:02:49 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-15 15:02:49 +0000 |
| commit | 18778503eaec61b840b6fc0dbf54022e322f4960 (patch) | |
| tree | cb2896c711c9132f9c17f3b3dd4b984f556aa95e | |
| parent | 0ace54e8bd1a0afea462894352a379623633e455 (diff) | |
| parent | ee05872759daf5973905fb4434cc3b1b0584d88b (diff) | |
| download | gitlab-ce-18778503eaec61b840b6fc0dbf54022e322f4960.tar.gz | |
Merge branch 'issue_29449' into 'master'
Remove whitespace in group links
Closes #29449
See merge request !9947
| -rw-r--r-- | app/views/shared/groups/_group.html.haml | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/issue_29449.yml | 4 |
2 files changed, 6 insertions, 5 deletions
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 |